tree 919f7e85417554d119b8655273b17344ec36a09c
parent b24c38e4df0a4f152d1425577a824d7968c42e25
parent 39a259350e062095d20ada953e2f2b7a57f832c6
author Jason Monk <jmonk@google.com> 1496353548 +0000
committer android-build-merger <android-build-merger@google.com> 1496353548 +0000

Merge "Fix plugin reloading" into oc-dev
am: 39a259350e

Change-Id: Ifd64484b3e75c7ed860944eac33473d080613bf4