| commit | 7880f812f7f7f92db694963027b86716bcd5d777 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Apr 27 14:44:15 2015 -0700 |
| committer | Paul Lawrence <paullawrence@google.com> | Mon Apr 27 14:44:15 2015 -0700 |
| tree | 6bc692ab27fb4d76b4317c881d3d8f750fba32da | |
| parent | cbc37ce77a15938df13a1e6a66e892fbc0ae8a69 [diff] | |
| parent | 72fad66f0a1acf5d8f2e965613b39b7f506c594c [diff] |
resolved conflicts for merge of 72fad66f to mnc-dev-plus-aosp Change-Id: Ib6659a50ee3f1f1ac3719e5d3397c21f786b9afc