| commit | ef15776aaf850777dfa7f640bcd3889855a01314 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Tue Jul 25 12:00:01 2017 -0700 |
| committer | Lucas Dupin <dupin@google.com> | Tue Jul 25 12:00:01 2017 -0700 |
| tree | c5f1506a11d6f8c26ed51dae1ed7ba206ff85c28 | |
| parent | 3072aa76c9ee475bdc76d16987855a7b7feffff6 [diff] | |
| parent | a1f64b0a9188d105ef1821510150b2ee42c9e47d [diff] |
resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3