| commit | 42f97fc62eeb2c923a6879ffc7b9c015b7b2ebaf | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 31 03:17:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 03:17:22 2015 +0000 |
| tree | 3220ccee044db98bf2775fd68d929d0cac00d53e | |
| parent | daffe1ebd977b6d54064638411e4c509a60c6888 [diff] | |
| parent | 616f6e464d9f51d9525be59efc667c679c479b9f [diff] |
am 8f218426: resolved conflicts for merge of 4e90b0ae to mnc-dr-dev-plus-aosp * commit '8f218426ff93e34149a637001098e198a403cece': More adb cleanup.