OSDN Git Service

Merge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1...
authorAndre Eisenbach <eisenbach@google.com>
Wed, 19 Jul 2017 22:25:51 +0000 (22:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 22:25:51 +0000 (22:25 +0000)
commitd5f592d5bb90ff710246619e8ac6e121ce516c2c
tree4fb4863709d14bfaff6eb81d6f0b66e2ea0808cb
parent18a2f354f4bd711d3027dfecfbbebc5eca479761
parent1ca355d6ed9cafa8703b6c538e884121b09aedd4
Merge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am: 1ca355d6ed

Change-Id: Idbce69ff4607232857c3c31dfd40b0845debd18c