| commit | 5fc15051195f8ae742adb27ccdc352c7ab5fc014 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:38:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:21 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 6fc6ac8493ec958fe0b22f994a9ae3cbf753a881 [diff] | |
| parent | ab30e3e4663969bfee9473465b9f8aa7d8e15814 [diff] |
am d4d2f48f: am 9bc8005e: (-s ours) resolved conflicts for merge of 3ecba7f9 to mnc-dev-plus-aosp * commit 'd4d2f48fa78505f504b5cdf73b61dbdcc2e5bfc9':