| commit | 3c017d58dc95a18774daf829571dac9de367070a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:30:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:30:59 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 43fcd23f67b2357ce74321f33930bf2754ab76ac [diff] | |
| parent | 041c1bee9e18d74f1c1820764a2b0ffbdf2a1a06 [diff] |
am 5d238ddc: am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp * commit '5d238ddc156ae061a8b69fa9c4141e76ae5d07b2':