OSDN Git Service

Merge "Protect instant apps from full apps" into oc-dev
authorTodd Kennedy <toddke@google.com>
Mon, 5 Jun 2017 16:44:45 +0000 (16:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Jun 2017 16:44:45 +0000 (16:44 +0000)
am: 4972aa30bf  -s ours

Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5


Trivial merge