tree 52cbaff31cc4737469b1a66e1a2e51ca8494b7cc
parent 096c66546e0fb49c0caf9e491327ef87da6bc6ef
parent 6b95e5cfd3707c2a657f788860691b2db8147bc9
author Tianjie Xu <xunchang@google.com> 1535423181 -0700
committer android-build-merger <android-build-merger@google.com> 1535423181 -0700

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

Change-Id: I7e2979511edcbb1f8cc2b789eca8bafa5751a926