tree 117431bfe50021c8a5de4abfc014090f561a12a3
parent de38b23d0f811bed29f462e580430fc3aa781049
parent 05e3f55f17e36b415a23095dbeaa1d04716aed5a
author Christopher Tate <ctate@google.com> 1383943663 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383943663 -0800

am 05e3f55f: am 1d8f592a: am ef12b1d4: am ea198841: am ef4694cb: am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

* commit '05e3f55f17e36b415a23095dbeaa1d04716aed5a':
  System package permission decls take precedence over 3rd party apps'