| commit | 6fc6ac8493ec958fe0b22f994a9ae3cbf753a881 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:38:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:38:19 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | f7fd559c1b87b0a21861d9310372e8945306c987 [diff] | |
| parent | ed5691d4170eb8e80a90b77abab01c7f529785f5 [diff] |
am b62af3eb: am 478bca2e: (-s ours) resolved conflicts for merge of ba8fc829 to mnc-dev-plus-aosp * commit 'b62af3eba81f9a1ed49f8b218a4851012df962f3':