tree 71169e10df5bb6c3bb082012b2eecf2708fa3bb9
parent d084cc44eb59407c851399d548256c145eb45342
parent 1d8f592a752c30534a6e03889f1ba42b232770ef
author Christopher Tate <ctate@google.com> 1383943538 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383943538 -0800

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 '1d8f592a752c30534a6e03889f1ba42b232770ef':
  System package permission decls take precedence over 3rd party apps'