| commit | 8f218426ff93e34149a637001098e198a403cece | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 20:09:15 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jul 30 20:09:15 2015 -0700 |
| tree | 1c3864dbef8eda1768ee5d7bccf56f5db6cb89dd | |
| parent | d260be38c647792b4318443f22da3cffc74b5918 [diff] | |
| parent | 4e90b0ae59a7b773fba39065494cb41d6853f5be [diff] |
resolved conflicts for merge of 4e90b0ae to mnc-dr-dev-plus-aosp Change-Id: Ib82bd1143c852905d40968896b5bcf41e0dab340