| commit | b665041eff49a92804bc43cb7d92c8ab827d75e7 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:09:30 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:09:30 2015 -0700 |
| tree | 206f9684a98d74159d52878bd68d24e8af8d45c2 | |
| parent | e063dcf108f6c6c90bf3099da568e8a629414a77 [diff] | |
| parent | 3777e2c43a7b19996f9b4893e57f46198facc2d4 [diff] |
resolved conflicts for merge of b21de5f6 to mnc-dr-dev-plus-aosp Change-Id: I13fd71d5af0b0a66d0c3e2f026581c60e9b95e8b