tree 904bd1cdcbf5ef265464fe29e1278d5412621aef
parent ab526b124623052c6db1a5bcb02bca66e73509c4
parent 750bb463055aad41b605e7eb9767c865a2a47c57
author Tao Bao <tbao@google.com> 1477498834 +0000
committer android-build-merger <android-build-merger@google.com> 1477498834 +0000

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

Change-Id: I619c61797e4a37419daa6b9e03c61b12e1c502cc