tree a99cb49f0adcb714394660c444be49d3fe57e90f
parent 43318fb4551e284df879156bf6207a6371375599
parent f0fd4f59836c4631c9d5736de384e8f014eccc25
author Tao Bao <tbao@google.com> 1525207718 -0700
committer android-build-merger <android-build-merger@google.com> 1525207718 -0700

Merge "Add ScreenRecoveryUI::ShowMenu()." am: cac3ec3513 am: a2f44ebd09
am: f0fd4f5983

Change-Id: Ifb6649be23644a366f2830ca50748b21d2ad92c1