tree 01a0d3c321d48b0a109ace335bb2911d7d8dc7b1
parent eb9905b851f9da2427e62b62b3abe788c6273c5d
parent 408edfafc5fdb47dcf411b296ed9659b4dfe5f31
author Tao Bao <tbao@google.com> 1477499375 +0000
committer android-build-merger <android-build-merger@google.com> 1477499375 +0000

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

Change-Id: I6d90c9822cf1ac5c440ab703c476b6b3bab42610