tree c1e81800455b1ad5a829fed60f730582b93580f4
parent d118394d444107dba4430723d248863ff412c444
parent bed08333d921e97bc60b81c0f183816386709d79
author Geremy Condra <gcondra@google.com> 1364427741 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364427741 -0700

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

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