tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent 86487d68557865faae5c612512764b1fb3529b93
parent 74851d8191fdbd8350ba33778b8fdbb142dfde27
author Tao Bao <tbao@google.com> 1477499104 +0000
committer android-build-merger <android-build-merger@google.com> 1477499104 +0000

Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305
am: 74851d8191

Change-Id: I2f0e2871182541bc64879b86abfcb98306b9c35e