OSDN Git Service

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

Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5


Trivial merge