| commit | aa719e92ffc2193db68c86b97fce291c27d5d4dd | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Nov 06 16:57:01 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 06 16:57:01 2013 -0800 |
| tree | 45cb516b47f779439147c3a4a401bc28be19fab4 | |
| parent | b3651b6fc3cf7450bf7dc47d5f7a882d5e220087 [diff] | |
| parent | c157cac9b2827a4eeb0ea29209fbb879a6076de4 [diff] |
am c157cac9: Merge "System package permission decls take precedence over 3rd party apps\'" into klp-dev * commit 'c157cac9b2827a4eeb0ea29209fbb879a6076de4': System package permission decls take precedence over 3rd party apps'