| commit | 3234255c953cf91b9e046fda1a90b6ad14a7a55a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:57 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | d140aa3e274acbbf5aac0411f5f3b3db4db6a9a2 [diff] | |
| parent | 7755b3697e0cc3b104c00472b128604db6457698 [diff] |
am d2d83da4: am 8b262b9d: (-s ours) resolved conflicts for merge of 038b76c2 to mnc-dev-plus-aosp * commit 'd2d83da4e4a6fa1555e6385ec6ebc6f6b1e0d21c':