OSDN Git Service

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

Change-Id: I302f180dc9813b015da800785feb493e8b9a0a7f


Trivial merge