tree e4c405f36d436b243a5d8a10270ce98ee72fbb2b
parent 9bf1a1394852ad773d590d1cc60c5e50be8cb1b9
parent ae229d991711745bdf8da2e716c31efde534e6da
author Christopher Tate <ctate@google.com> 1383942853 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383942853 -0800

am ae229d99: am 43253333: am 50cbfd55: System package permission decls take precedence over 3rd party apps\'

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