OSDN Git Service

Merge "Track getxattr API change" am: c4c4a1e76e am: f897e1c3b6
authorYi Kong <yikong@google.com>
Mon, 29 Aug 2016 08:15:53 +0000 (08:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 08:15:53 +0000 (08:15 +0000)
commitbe5137f4cb70ca47e4c929a878cfee2a9bf5ebfb
tree0a38238224bbe17883ae3331d12e53c7bd371c02
parentdbac6566f8f289c80f69b70fc0a10544156f9f34
parent2b5a0d299dea53dd9e0e1679e869e69f337f3803
Merge "Track getxattr API change" am: c4c4a1e76e am: f897e1c3b6
am: 2b5a0d299d

Change-Id: I845657a3c8f14f38f0c3b490d16677620ba0bcc4
services/core/java/com/android/server/pm/SELinuxMMAC.java
services/core/java/com/android/server/pm/UserManagerService.java