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

Change-Id: Ie8be0fb9b943e5bc8b1046e8e3eb3384e52b223a


Trivial merge