| commit | 3c920894440e4830c47a11ca5a61672d4d861fec | [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 | c2645fdc8d3ffcd4397ba3b2d8b17beb2cf6cea8 [diff] | |
| parent | 8db6069b43c107cb3585743758659e20f46dfd6f [diff] |
resolved conflicts for merge of 72fad66f to mnc-dev-plus-aosp Change-Id: Ib6659a50ee3f1f1ac3719e5d3397c21f786b9afc