tree e021e4e435ef25eba7b23ffdf2ad01122fd329b4
parent 22bcf97a5949816db85242157cb2640feed73616
parent 3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6
author Riley Andrews <riandrews@google.com> 1403657042 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403657042 +0000

am 3e0fc39e: am 974fe112: Merge "Fix recovery mode."

* commit '3e0fc39ec27c0ed96ffd2a617f1841fe3bf3c8f6':
  Fix recovery mode.