OSDN Git Service

Merge "Add default icon for permissions" into mnc-dev
authorJason Monk <jmonk@google.com>
Wed, 13 May 2015 21:06:28 +0000 (21:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 21:06:30 +0000 (21:06 +0000)
commitd7fd045014b746a9822a66390288f44b63e4dc2f
tree41d06681869ae4022da63fd3fd0116a73cb825ef
parentc968e219372e140e2ae34f9b1e91597ccb719381
parent0e6cac26585b04dc9a357b03cab09d93404819f1
Merge "Add default icon for permissions" into mnc-dev
core/res/res/values/symbols.xml
packages/SettingsLib/src/com/android/settingslib/applications/PermissionsInfo.java