OSDN Git Service

Merge "Additional setup and reduced file collision" into oc-dr1-dev
authorMaggie White <maggiewhite@google.com>
Fri, 7 Jul 2017 18:26:10 +0000 (18:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 18:26:10 +0000 (18:26 +0000)
am: b5aca0236f

Change-Id: I2b4a19920e567a690eeb79b2c8328bcd7191fdec


Trivial merge