tree 52ef7f4330985d388bb4a4c054e3efa019aa38a3
parent 2ff6099854691e3406a17797d4aa83624174e6f4
parent 297f802f25d093274c1f5fb890ee8dfacfbf159e
author Kenny Root <kroot@android.com> 1344876600 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344876600 -0700

am 297f802f: Merge "Add support for reloading policy from /data/system."

* commit '297f802f25d093274c1f5fb890ee8dfacfbf159e':
  Add support for reloading policy from /data/system.