diff options
| author | Craig Mautner <cmautner@google.com> | 2014-01-10 11:15:19 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-01-10 11:15:19 -0800 |
| commit | 1f7488e21994d7b6e143a4540659c1fbae630634 (patch) | |
| tree | 5f37492c5e042151ac5eced68c6ade6b04f78875 /policy | |
| parent | b0574ac0a3bb7cf169b86dcbfa8873cf0e7b1233 (diff) | |
| parent | 4504de5d5a8e1c7dfb306b16282f348856c24764 (diff) | |
| download | frameworks_base-1f7488e21994d7b6e143a4540659c1fbae630634.zip frameworks_base-1f7488e21994d7b6e143a4540659c1fbae630634.tar.gz frameworks_base-1f7488e21994d7b6e143a4540659c1fbae630634.tar.bz2 | |
resolved conflicts for merge of 4504de5d to master
Change-Id: I8d96fd2b479aebd6de913e617ca190f66c25aaa5
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneLayoutInflater.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneLayoutInflater.java b/policy/src/com/android/internal/policy/impl/PhoneLayoutInflater.java index 5d8d0d1..df6fca4c 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneLayoutInflater.java +++ b/policy/src/com/android/internal/policy/impl/PhoneLayoutInflater.java @@ -24,7 +24,8 @@ import android.view.LayoutInflater; public class PhoneLayoutInflater extends LayoutInflater { private static final String[] sClassPrefixList = { "android.widget.", - "android.webkit." + "android.webkit.", + "android.app." }; /** |