tree 5302139ae42bbfcc5a215845451dcd25ba973e21
parent 30886cb817a0e84ac10a26155b91bf6c84f417dc
parent 7f5b51441145df3c2ffb445fc0637a88d588cc21
author Tao Bao <tbao@google.com> 1501798226 +0000
committer android-build-merger <android-build-merger@google.com> 1501798226 +0000

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

Change-Id: I63473a830b0736da5e4f16febf0ee826d870ab40