| commit | 3728b8cd3b99a732c691d38910e61987d0915755 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Aug 27 05:23:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:23:51 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 47d9ac60c05a2ea752ff328c01c28116775dbdc1 [diff] | |
| parent | de29bee23b2de8347f24287f4b04be89a7f55dab [diff] |
am de29bee2: (-s ours) resolved conflicts for merge of 69a4f949 to mnc-dev-plus-aosp * commit 'de29bee23b2de8347f24287f4b04be89a7f55dab':