OSDN Git Service

Merge "Additional setup and reduced file collision" into oc-dr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 7 Jul 2017 18:14:36 +0000 (18:14 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Jul 2017 18:14:36 +0000 (18:14 +0000)
commitb5aca0236fdcb1f8934e2caf32397346676ffee3
treee559734b916b5dfcf4ffaa1c95e3b99a77c40538
parent7f60c1a8af6b7eb01a33b8f49d6dda48fbc59b23
parent0584bbd4803436bc0492b8086e01c920a1cb2178
Merge "Additional setup and reduced file collision" into oc-dr1-dev