OSDN Git Service

Merge "Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 8 Jun 2017 05:48:45 +0000 (05:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jun 2017 05:48:49 +0000 (05:48 +0000)
commitc9208d362fdbe2c2ba980581216c770af29901fe
treeacba543300fd6eddaabb20ff0a39fd12c7fcb121
parent54a6869814d02a183c11d1bad2ab2f2d53d3f11c
parent8a03d88812d7918621a9c21184b90136cd3bcf5f
Merge "Merge "resolve merge conflicts of 695f21a66189 to oc-dr1-dev" into oc-dr1-dev am: be261948cb" into oc-dr1-dev-plus-aosp