| commit | 983ba6f34becf3afe867351f195c26246cd287e7 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Thu Aug 27 20:36:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:36:57 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | 7cf4e478fdefdc78831bb0ee2140425ccf214964 [diff] | |
| parent | 08b60279ff2680b46122a7693a355ef2491d6e3e [diff] |
am 08b60279: am e21dfd02: (-s ours) resolved conflicts for merge of b571ecfd to mnc-dev-plus-aosp * commit '08b60279ff2680b46122a7693a355ef2491d6e3e':