From: Arve Hjnnevg <arve@android.com>
Date: Tue, 9 Aug 2016 21:16:24 +0000 (+0000)
Subject: DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931... 
X-Git-Tag: android-x86-7.1-r1~70^2~14
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3866c201b;p=android-x86%2Fframeworks-native.git

DO NOT MERGE ServiceManager: Restore basic uid check am: 247ae46340 am: 171ab27931 am: 101c678909  -s ours am: e55418a857 am: 419626b496 am: 12151706b2 am: 899d956cf3  -s ours
am: 66818cfeae

Change-Id: Ie8be0fb9b943e5bc8b1046e8e3eb3384e52b223a
---

d3866c201b5620f820ab320234bcaf076d2219ba