tree 1e61a35dfd49f37fa5962abcc901f43f152e792e
parent adcd1fe0f6a28aab9e25a8a2aa65440d7d0929f4
parent 57ad8be7ecb65003ea83ca7536e5d513e8ada1cb
author Ying Xu <yinxu@google.com> 1498499141 +0000
committer android-build-merger <android-build-merger@google.com> 1498499141 +0000

Merge "Fix the inconsistency of scan status." am: 41be35a1bd am: ac2d00a195 am: e30cfbea60
am: 57ad8be7ec

Change-Id: I2ee40a6c22a1bfe58ca107790719c5695aa7c774