tree 4ae5688400353f5afacc7b11ab499e5878fe249e
parent 0c2e5705d8ed926b4735e07f40b356f731b60093
parent 1148bc2a6be14fb38fdc210137e91cd9f0a0be20
author Jean-Baptiste Queru <jbq@google.com> 1346895807 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1346895828 -0700

Merge upstream sepolicy into AOSP

Change-Id: If3ed9998033378de5b47472315444f5b8bd4743e