tree ecce5209a54b80e47fcdf959672755dcc5e32fee
parent 74098080e07f6c63ad85747e1a695c85e45c8106
parent 99f78994cb2613b0d302ce968714ecd66622c05d
author Tao Bao <tbao@google.com> 1501798883 +0000
committer android-build-merger <android-build-merger@google.com> 1501798883 +0000

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

Change-Id: I1cf65cc463c11a8b59f560dfc03b3bc87ea3b68b