| commit | fea5be50464760c289e08d29d5145ed4a0d6cbb3 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Aug 27 20:36:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:45 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | ad0d6586c1c419ce438e1236ec403226b329be3c [diff] | |
| parent | 680e464d24f45f0911821386c5f7c6a1aca02bab [diff] |
am 680e464d: am 55a422a3: (-s ours) resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp * commit '680e464d24f45f0911821386c5f7c6a1aca02bab':