| commit | 041c1bee9e18d74f1c1820764a2b0ffbdf2a1a06 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:49:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:49:42 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 11b9deb33c42fb993eae2a7cff480db724f87fc3 [diff] | |
| parent | 929a60cce2bb66440464d95fbf8541945870353f [diff] |
am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp * commit 'd2117974e4c22ff6b8967c3b5cd2d497a6ffc856':