OSDN Git Service

Merge "Merge "resolve merge conflicts of 7d0ad232f to oc-dr1-dev" into oc-dr1-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 13 Jul 2017 20:55:11 +0000 (20:55 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jul 2017 20:55:11 +0000 (20:55 +0000)
commit2ff4747af7fc2b212d883eed2fab3e3ebac9afe1
tree67ffff4b42cd795ab716ec29e0596c7ae6d07eda
parent65f92f4ac93a6723c70e3e0479eb06a997a489b8
parent8b903f9368c1f11946665794f37bc2ccdc2d3594
Merge "Merge "resolve merge conflicts of 7d0ad232f to oc-dr1-dev" into oc-dr1-dev am: 79bc6a57df" into oc-dr1-dev-plus-aosp