summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/SystemServer.java
diff options
context:
space:
mode:
authorChad Brubaker <cbrubaker@google.com>2017-06-21 08:25:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-21 08:25:55 +0000
commit6aff0ffe8befb646f1aa46ea513e7e89701cec00 (patch)
treeb73d4012735d741e2ac9ab1fadafa7e4ab34d775 /services/java/com/android/server/SystemServer.java
parentd1d3d0fcfc82eb5550be4660fe9cfec3b19db7db (diff)
parent53d87ebb559f8dcfa3ac04c5cdf503006f48d8a8 (diff)
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am: 88f98985d5
am: 53d87ebb55 Change-Id: Ie0877eefee8c61c95ffa16303d56c6a448933032
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
0 files changed, 0 insertions, 0 deletions