OSDN Git Service

DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36 -s ours am:...
authorArve Hjnnevg <arve@android.com>
Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)
am: 1c220583e4

Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5


Trivial merge