tree bf11ed9395ad29e5c9d158821c531b36d8998aa5
parent 943eafc45b422e7f79aef89cb642cd6e90916a8b
parent b984203cb27de4b50b44f362f8b61fffa09a4b70
author Hai Zhang <zhanghai@google.com> 1598669412 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598669412 +0000

[automerger skipped] DO NOT MERGE Don't allow non-instant permissions for instant apps. am: a710a30457 am: ea36a0c236 am: 043a322e4d -s ours am: 29eef120e2 -s ours am: b984203cb2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12366889

Change-Id: I6bb6906882e704afd277f80fb2d7d055bc365fa5