| commit | 58e3fba7c95f1db06f6c2e8de26c8a7ce076bff1 | [log] [tgz] |
|---|---|---|
| author | Dongwon Kang <dwkang@google.com> | Mon Oct 16 22:31:58 2017 -0700 |
| committer | Dongwon Kang <dwkang@google.com> | Tue Oct 17 17:52:59 2017 +0000 |
| tree | 54a9dff7dd7360867e506bf4dc75adabe50a7274 | |
| parent | 27f4a784abb920fc406be222f136eaaee0a6015a [diff] | |
| parent | 8513b434d3a6d535e4542b96cb1a6fc8199004bf [diff] |
resolve merge conflicts of 8513b434d3 to oc-mr1-dev-plus-aosp Test: build Change-Id: I1c2933b72ca6f9a3e8c7693ee7ed51a4654c5956 Merged-In: I101334d1a5132fbe7da64f48770a415397020a02