| commit | 1ff81a85b61997fe23edb6fa5b30ba72bc694039 | [log] [tgz] |
|---|---|---|
| author | Steve Muckle <smuckle@google.com> | Mon Aug 14 15:17:58 2017 -0700 |
| committer | Steve Muckle <smuckle@google.com> | Mon Aug 14 15:17:58 2017 -0700 |
| tree | 3d29f773ddf1a634aa0a2b26e603d959bc033fc8 | |
| parent | 66d2b8b1855c31f9fc80f6326d3c891d7836d006 [diff] | |
| parent | d4eb7a322c912c9307561faf59d09a9909d3c7a0 [diff] |
resolve merge conflicts of d4eb7a322c to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ibca2aa11ede8142639f919eebeaf879236f82c8b