tree e2a56af5f19efe84927a0a46fee9e6e49795aa1f
parent 880d3f39f711f9ca6d2ba5c9cf127265fa39efad
parent d7547163d5b0bf9e2cde626c0b7c6a58d48eb89e
author Ying Wang <wangying@android.com> 1344899009 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344899009 -0700

am d7547163: am 679b7498: Merge "Add mac_permissions.xml dependency."

* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
  Add mac_permissions.xml dependency.