summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-04-07 11:13:16 -0700
committerNick Kralevich <nnk@google.com>2013-04-07 11:13:16 -0700
commita56b78dcd1292a4291d85113bdeeda8496c1a0c0 (patch)
tree10ee1ac2f57b0372eef20d13a42ad58b5d6933a4 /core/java
parentd7c4186ae040ed297634b0be11f78592ffc7585f (diff)
downloadframeworks_base-a56b78dcd1292a4291d85113bdeeda8496c1a0c0.zip
frameworks_base-a56b78dcd1292a4291d85113bdeeda8496c1a0c0.tar.gz
frameworks_base-a56b78dcd1292a4291d85113bdeeda8496c1a0c0.tar.bz2
fix build
Change-Id: I7f3b8a4df84630f40f5a3f19434df86b6287fb75
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/AppSecurityPermissions.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AppSecurityPermissions.java b/core/java/android/widget/AppSecurityPermissions.java
index a042485..589a358 100644
--- a/core/java/android/widget/AppSecurityPermissions.java
+++ b/core/java/android/widget/AppSecurityPermissions.java
@@ -520,7 +520,7 @@ public class AppSecurityPermissions {
private static PermissionItemView getPermissionItemView(Context context, LayoutInflater inflater,
MyPermissionGroupInfo grp, MyPermissionInfo perm, boolean first,
CharSequence newPermPrefix, String packageName, boolean showRevokeUI) {
-git co PermissionItemView permView = (PermissionItemView)inflater.inflate(
+ PermissionItemView permView = (PermissionItemView)inflater.inflate(
(perm.flags & PermissionInfo.FLAG_COSTS_MONEY) != 0
? R.layout.app_permission_item_money : R.layout.app_permission_item,
null);