OSDN Git Service

DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931...
authorArve Hjnnevg <arve@android.com>
Tue, 9 Aug 2016 21:07:23 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 21:07:23 +0000 (21:07 +0000)
am: 12151706b2

Change-Id: I0e550c834f988591d761a1830bee72e99be968f1


Trivial merge