| commit | 7755b3697e0cc3b104c00472b128604db6457698 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:45:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:45:41 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | b21f473fcaa8c3bfd48bb9942046f98547bd2dd2 [diff] | |
| parent | 43c4f436742a8f74440eed53c87bbd6796df753d [diff] |
am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp * commit '8b262b9de4defd234ec3593453bfb1dba4642151':