| commit | 616f6e464d9f51d9525be59efc667c679c479b9f | [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 | 323c08bdebf6b61275ee26465d7802370e49184e [diff] | |
| parent | 1d45c33763b20a1838371716b58a4ed9239c3667 [diff] |
resolved conflicts for merge of 4e90b0ae to mnc-dr-dev-plus-aosp Change-Id: Ib82bd1143c852905d40968896b5bcf41e0dab340