| commit | 1bbec096790d7af069efc1858776b01f156f20d6 | [log] [tgz] |
|---|---|---|
| author | sachiyo <sachiyo@google.com> | Fri Jan 26 21:34:17 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 26 21:34:17 2018 +0000 |
| tree | 12d3da1f071fc130bc7c7542f58494ebb946be74 | |
| parent | bfa0ecb059cb7da9a3132673370f6eaab103edee [diff] | |
| parent | 5f60238c666333bed0b00c578cc219038f0da773 [diff] |
resolve merge conflicts of 11e66338a17f9c3154758833549e11fc6864c9cf to oc-mr1-dev-plus-aosp am: 5f60238c66 Change-Id: I965b02e5ce61a01917bf086970c1a99be4ee6234