OSDN Git Service

Merge "Refactor TISM add/remove code" into oc-dev am: c0af382a25 -s ours
authorErik Kline <ek@google.com>
Thu, 22 Jun 2017 14:06:59 +0000 (14:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 14:06:59 +0000 (14:06 +0000)
am: caafb1fbe3  -s ours

Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66


Trivial merge