tree ac62c010a246d59d47638db4d84022649527c046
parent 14433db1b2d2b6019e1c2fe3e716e798d17aef2a
parent 154eca93e7b03a52b3bdbc5b43fc649b5c775cbe
author Neil Fuller <nfuller@google.com> 1499944835 +0000
committer android-build-merger <android-build-merger@google.com> 1499944835 +0000

Merge "Re-enable use of isPrivilegedApp()" am: bd51de1b20 am: a5a493cc19 am: 3a6b550753
am: 154eca93e7

Change-Id: Ie8793108595b128a8ec898b4cada98c98a93fb1c