| commit | a349943547b352a1f012ed993c6eebb4d5582246 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Tue Oct 31 20:07:14 2017 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Tue Oct 31 20:07:14 2017 -0700 |
| tree | 2e43641c30d971f9faec62eabad80c072ac034bd | |
| parent | 4cd0b6bddf0fbcaa249eba4365e11ecaf1a1cbda [diff] | |
| parent | 367503146b83e0ae66e4f46ce561e587166e1979 [diff] |
resolve merge conflicts of 367503146 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I1e5948e994791f4727ab5fa49c0b885551c208dc