| commit | 3c01c0db368f985e2601dc7521e97c641bb11e4f | [log] [tgz] |
|---|---|---|
| author | Sen Jiang <senj@google.com> | Fri Jan 12 03:43:23 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 12 03:43:23 2018 +0000 |
| tree | b2221d82b71ff9cabd739cdeac405dd497cfe8f1 | |
| parent | 44906965d0809992052e47e11809ec730813d8b0 [diff] | |
| parent | 682cad5a12a41b9cf4e4c5af964403c3e0cb284a [diff] |
resolve merge conflicts of 0b77cb9fa6941163c4a4099471bef6ef564c0ffe to oc-mr1-dev-plus-aosp am: 682cad5a12 Change-Id: I956fab72bf7800157b052819d22a4edb99680cc6