| commit | e999d0071defdff7d9ee8f3553f2a9607bca8780 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 11 02:55:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 11 02:55:26 2015 +0000 |
| tree | 7937dbb2ee729a62bbd68580a7cd34b3a98f50c2 | |
| parent | 54b373c04493ddd0be3161fd3253681a7b7f49a6 [diff] | |
| parent | dcbf4fc571236bf5aa5286294b3c727be725db70 [diff] |
am dcbf4fc5: resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp * commit 'dcbf4fc571236bf5aa5286294b3c727be725db70': recovery: Properly detect userdebug or eng builds