| commit | 35a58d5ee7da5470460e95ae74361e89e1e55a15 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Aug 03 14:19:35 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Aug 03 14:19:35 2015 -0700 |
| tree | 97ed6b33ee2aa6adac00ea7496536d6785abbc88 | |
| parent | 27ca16e9f4cad19045bbf3043daf2b8513b45c37 [diff] | |
| parent | 5bb72cc59aa9cb03aeef2f0aedef055ecc74b507 [diff] |
resolved conflicts for merge of 0070026c to mnc-dr-dev-plus-aosp Change-Id: Ibc802572898b6913c1f5d94aaae19974bfc0eb85