| commit | 94261952b45f3e6bf2f7a0305bbf996a5cde1ac5 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Thu Aug 27 11:54:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:54:55 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | a85fbc51769b2e47d93ba42101bff5aa9e91b49c [diff] | |
| parent | 9369592e2d6b264f649ab1b688e73ad58214427a [diff] |
am 57a082f4: (-s ours) resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp * commit '57a082f4de1864daf545e9f11f7373a409614326':