| commit | 709abf5794d28da23ff9425bf548ca0a40932f75 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 14:37:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:37:20 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 4dafcfb277806a9efe8718f5819aaef9f2d62688 [diff] | |
| parent | 94261952b45f3e6bf2f7a0305bbf996a5cde1ac5 [diff] |
am 4dda1858: am 57a082f4: (-s ours) resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp * commit '4dda18586fd85cfea90b61cc69a3d964c1b3cdde':