tree 7e8d33676678e2240d5368fca8465712b24285cd
parent c22f5774d04bed56c7c00874b5a0a0ec37f605aa
parent 5d1630a926a02ca13a66eb1e385eabba16b04cfc
author Elliott Hughes <enh@google.com> 1428697954 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428697954 +0000

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

* commit '5d1630a926a02ca13a66eb1e385eabba16b04cfc':
  Fix ScreenRecoveryUI to handle devices without power/up/down.