tree accd2e98b58ccf92c30ec52f39dc4ede20485645
parent 62495abcdce58c930eb5826eeb51ddaef5a0ac05
parent 04598de87251c433594f1073ebcd8116cee49345
author Geremy Condra <gcondra@google.com> 1363733036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363733036 -0700

am 04598de8: Merge "Replaceable mac_permission.xml support"

* commit '04598de87251c433594f1073ebcd8116cee49345':
  Replaceable mac_permission.xml support