tree a99cb49f0adcb714394660c444be49d3fe57e90f
parent f23115cc605dce2287d64d84b6ca4224771d7f3b
parent a2f44ebd09ad929ee0669be9d217cf07d26f4770
author Tao Bao <tbao@google.com> 1525207564 -0700
committer android-build-merger <android-build-merger@google.com> 1525207564 -0700

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

Change-Id: Ifd9b438412fa2c2ca6d3bfcbfe3d620b15663070