tree 37eb5f142faa9fa5ef8eb3f1f7ee32c30875e3c5
parent 56afaf2c18dd605a35fc11bf3ee7cdcfb054c78d
parent 11ed014edf98d43a70ed42da6a6e6dddb21f8b2d
author Chen Xu <fionaxu@google.com> 1608002995 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608002995 +0000

Merge "add permission check for exported activity" into rvc-qpr-dev am: 11ed014edf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65b25d86e6f2a21244f88699b0da537804a27cfc