| commit | 6d188757558dd572da85a7863f86fe0d8fa61601 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 14:28:44 2015 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 14:28:44 2015 -0700 |
| tree | 857c6d6730f828d27d6945045ee78a7de52cba36 | |
| parent | 8a5f9d08c5717762a8ce41e63b68c9a52e20ce3a [diff] | |
| parent | 5376cfacf49d00188da764ba0ead9871fe62be53 [diff] |
resolved conflicts for merge of 6a5244bc to mnc-dev-plus-aosp Change-Id: Ied1bbf09aeeed53daefb53c559498066abd9b767