| commit | d5fa6d9844c6dcc87bb305ff6cb7989b782bfcb1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:31:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:31:01 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3c017d58dc95a18774daf829571dac9de367070a [diff] | |
| parent | 68b9b726789338c3d1bf2218ede33193ff92d38a [diff] |
am e0dd7955: am e0b43a17: (-s ours) resolved conflicts for merge of 4e90b0ae to mnc-dev-plus-aosp * commit 'e0dd7955cb47b012bc1225a55d268019f4b3482b':