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

DO NOT MERGE ServiceManager: Restore basic uid check am: eb304f0a36  -s ours am: a82f82293a
am: 1c220583e4

Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5
---

ce472fbb54c1a1bb3245235b21b17ab101d4e25e