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)
commit266e587f6b5d6bb6933a47e53bede9b2c7265bc3
tree96841fff0df18606c90181f7cb580c25c9d175f1
parent27c2b724ae311c58d798dc07a8372c8aa16f0b45
parent4972aa30bfa1b69d73389f5ecd02071f4c799ec3
Merge "Protect instant apps from full apps" into oc-dev
am: 4972aa30bf  -s ours

Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5