OSDN Git Service

Merge changes from topic 'frankenbuild' into oc-dev
authorMichael Wright <michaelwr@google.com>
Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)
am: adb87ec50b

Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0


Trivial merge