OSDN Git Service

am 1f4a1c58: am a589b67f: Merge "Handle apps that share a UID with the system_server...
authorNarayan Kamath <narayan@google.com>
Fri, 25 Jul 2014 14:42:14 +0000 (14:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 Jul 2014 14:42:14 +0000 (14:42 +0000)
* commit '1f4a1c5823e11dd48a0d076ab88f33a32aef478a':
  Handle apps that share a UID with the system_server correctly.


Trivial merge