tree 209d2b01d9adfc2d7a8e8c0d0a0327e0ea94ad44
parent 8b925068215958102bfbd83fb725e4f1a75d7a86
parent 96c109e8f6de0a2541aabccacecec65bd5ec4c31
author Geremy Condra <gcondra@google.com> 1364431523 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364431523 -0700

am 96c109e8: Merge "Revert "Revert "Rewrite mac_permissions.xml file."""

* commit '96c109e8f6de0a2541aabccacecec65bd5ec4c31':
  Revert "Revert "Rewrite mac_permissions.xml file.""