| commit | 99d9187fee72a17bdbae480daf75089d4c6edc09 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:38:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:28 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 5fc15051195f8ae742adb27ccdc352c7ab5fc014 [diff] | |
| parent | fd8de96461392acb3d4bf4ffe829735d206ba7e6 [diff] |
am ceb0b50f: am 9ccf4bfb: (-s ours) resolved conflicts for merge of 068ee4d0 to mnc-dev-plus-aosp * commit 'ceb0b50f974da07872fec78c4151e6a3cab7abb7':