| commit | 27d3cfb0b78d8e4fdb2840e5555e9556d7313d20 | [log] [tgz] |
|---|---|---|
| author | Dongwon Kang <dwkang@google.com> | Tue Oct 17 20:16:47 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 17 20:16:47 2017 +0000 |
| tree | 5b8b7a07e5f146b796f39218853676e821a9f7ff | |
| parent | e06ec66ecef0086d36bacf20e085982f27b59d92 [diff] | |
| parent | df3be9cc7981ce0623686013d529aac18b6d9e7c [diff] |
Merge "resolve merge conflicts of 8513b434d3 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: df3be9cc79 -s ours Change-Id: I4111b8045c41891f142e2f4f6fddc20b524371cd