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:22:25 +0000 (21:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:22:25 +0000 (21:22 +0000)
am: a4ef62b859

Change-Id: I471e71c1abbb065d2e3c87671dadbff614fc4a9d


Trivial merge