tree 7937dbb2ee729a62bbd68580a7cd34b3a98f50c2
parent 54b373c04493ddd0be3161fd3253681a7b7f49a6
parent dcbf4fc571236bf5aa5286294b3c727be725db70
author Elliott Hughes <enh@google.com> 1423623326 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423623326 +0000

am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp

* commit 'dcbf4fc571236bf5aa5286294b3c727be725db70':
  recovery: Properly detect userdebug or eng builds