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)
commit8efaefb5d99ac342a39b59e9fa1c71a10d003ad0
treed59dca937161f44b2f191576774268185c990ebb
parentbab47edecb628bd50cca3131e9704fd413a597dc
parentadb87ec50b10eed0212af9f9b670ece64e03e0ec
Merge changes from topic 'frankenbuild' into oc-dev
am: adb87ec50b

Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0