tree 43b6352c4e9b4006e092ae0086189ade0714fad3
parent 4d71493e74ed1ea39e554146351cc39e47cb5d02
parent c0e1bc1c755b165574c761e878b6fc26fb340ba0
author Geremy Condra <gcondra@google.com> 1364427625 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364427625 -0700

am c0e1bc1c: Merge "Drop /data/system as a policy file location"

* commit 'c0e1bc1c755b165574c761e878b6fc26fb340ba0':
  Drop /data/system as a policy file location