| commit | 4220ed7ed7efd346252f1baec3360a5e34c21951 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Nov 06 17:01:38 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 17:01:38 2013 -0800 |
| tree | 32184447c2f493d32430bd2a69800004964f2480 | |
| parent | 6e3cc2acaee0c300eb978f10fefc29529b137dd3 [diff] | |
| parent | 90be73457e0a5e526db99dc6c9d35798d87067ca [diff] |
am 90be7345: am aa719e92: am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev * commit '90be73457e0a5e526db99dc6c9d35798d87067ca': System package permission decls take precedence over 3rd party apps'