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:18:53 +0000 (21:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:18:53 +0000 (21:18 +0000)
am: 1864a8748d  -s ours

Change-Id: I2e022f5c528ded283a40ad3e3a4ac230070a242b


Trivial merge