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

Change-Id: I50541ba686cafded699568f710627bf3e4f8aa1d


Trivial merge