tree 7e8d33676678e2240d5368fca8465712b24285cd
parent 2d71dcdc2acca82f4593ae5e6b482b7c79688700
parent 9b0ebf992e01960db42ab7debf02bb25b372c734
author Elliott Hughes <enh@google.com> 1428699952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428699952 +0000

am 9b0ebf99: am 5d1630a9: Merge "Fix ScreenRecoveryUI to handle devices without power/up/down."

* commit '9b0ebf992e01960db42ab7debf02bb25b372c734':
  Fix ScreenRecoveryUI to handle devices without power/up/down.