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

Change-Id: Ibe41eb3a2c9a0e28211d546b6b79469bb0523d01


Trivial merge