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

Change-Id: I9445235baf1ea98e3e47af3034fa49b0593ae1b2


Trivial merge