OSDN Git Service

Merge "Fix plugin reloading" into oc-dev am: 39a259350e
authorJason Monk <jmonk@google.com>
Thu, 1 Jun 2017 21:58:22 +0000 (21:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Jun 2017 21:58:22 +0000 (21:58 +0000)
am: aff8ddd341

Change-Id: I9926f139af24fa83b901b9406e4f12ba2ea1b500


Trivial merge