| commit | 90be73457e0a5e526db99dc6c9d35798d87067ca | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Nov 06 16:59:18 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 16:59:18 2013 -0800 |
| tree | 7d5ff7f0deac491d70853f72a50c9a3fd791915f | |
| parent | 2f70da2bc5ce9f4766395cc9d848f0afe8f6a2a9 [diff] | |
| parent | aa719e92ffc2193db68c86b97fce291c27d5d4dd [diff] |
am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev * commit 'aa719e92ffc2193db68c86b97fce291c27d5d4dd': System package permission decls take precedence over 3rd party apps'