tree 52cbaff31cc4737469b1a66e1a2e51ca8494b7cc
parent 1487523804d18e7d8b62eeafe60bf38d6476ff23
parent 3f288e438965767a1600bbf49495971ea03f3878
author Tianjie Xu <xunchang@google.com> 1535422939 -0700
committer android-build-merger <android-build-merger@google.com> 1535422939 -0700

Merge "Remove otafault" am: a1e3d67bd7
am: 3f288e4389

Change-Id: I5346a15d138a1ebc994cf6dd9beecd23a97d3d78