OSDN Git Service

Merge "Add UID and Service for Secure Element Application" am: b8b7589531
authorRuchi Kandoi <kandoiruchi@google.com>
Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 27 Jan 2018 01:59:46 +0000 (01:59 +0000)
commit2b894394a5392c9e205a6fa64601b2fee3b9a9ae
treebc71fc4e41d64b703d1b3727f31c122d3fb4ed09
parent40045aee45134da87b80a38d3c72772aad4eb71f
parent8ee3204c58631d2b420f7c197b71fbb1e48ccb32
Merge "Add UID and Service for Secure Element Application" am: b8b7589531
am: 8ee3204c58

Change-Id: I7c74f21e014fb7eb772e2d86cc278fd774ffb8c9
core/java/android/content/Context.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/pm/PackageManagerService.java