tree 0b9fb4ef053eb9fa4f4a09972e250a67d60b6247
parent f4ea5b25399e4c6a10aa353b0c3d40564f78e89c
parent 730957aef3f96ef5fa294515829ab7a37fd141cf
author The Android Open Source Project <initial-contribution@android.com> 1334076767 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1334076779 -0700

Merge from upstream sepolicy

Change-Id: I99085d575e3d884fb04ac03ac998eb3c53eb2d9f