tree ff035b3049729e2b5342766a9d9440dac1ad14de
parent 61dddba79f6412f4c889d4fa010f433f1dbc6e04
parent 5988bbf8a2b6c4b7f329ee007e75004269d71817
author Geremy Condra <gcondra@google.com> 1363733036 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363733036 -0700

am 5988bbf8: Merge "Dynamic insertion of pubkey to mac_permissions.xml"

* commit '5988bbf8a2b6c4b7f329ee007e75004269d71817':
  Dynamic insertion of pubkey to mac_permissions.xml