tree 8e161f6b96fdbecabb389b35aaa9e2acc7fe6501
parent 54a6117935fe7470d23f7a538aeec9d6b139791b
parent 974fe112ae6df95ca6d49688d6e3e459d87e16de
author Riley Andrews <riandrews@google.com> 1403656846 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403656846 +0000

am 974fe112: Merge "Fix recovery mode."

* commit '974fe112ae6df95ca6d49688d6e3e459d87e16de':
  Fix recovery mode.