| commit | 54991fe93b38581566cc1b9b83642dfa6ae4c972 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Mon Jun 12 14:10:15 2017 -0700 |
| committer | Myles Watson <mylesgw@google.com> | Mon Jun 12 14:10:15 2017 -0700 |
| tree | 4f1e1a83a54092ed1bf267f93d1595ffa51518cd | |
| parent | 318bda671076db554ef96ce0a430b8b4fcf463b8 [diff] | |
| parent | 100649c5f0fa769d3f59d3f96743ad4669e307ed [diff] |
resolve merge conflicts of 100649c to oc-dr1-dev Test: diff with AndroidTest.xml in oc-dev and master Change-Id: Id91e72f33dec8e4d44a5ad19c09335fe058feaf6