tree ecce5209a54b80e47fcdf959672755dcc5e32fee
parent 4d91ada15d7acd99262692f814253872d4367b67
parent 6ec170d867ee6f5acbca6de8e46ef2a5bc5db18a
author Tao Bao <tbao@google.com> 1501799248 +0000
committer android-build-merger <android-build-merger@google.com> 1501799248 +0000

Merge "ui: Check for bootreason=recovery_ui." am: f49cc02e86 am: 7c0b8a4322 am: 7f5b514411 am: 99f78994cb
am: 6ec170d867

Change-Id: I8cd8e422b81ff44620bf0ae901b032a28bed2eec