diff options
| author | Dan Egnor <egnor@google.com> | 2009-11-18 13:43:10 -0800 |
|---|---|---|
| committer | Dan Egnor <egnor@google.com> | 2009-11-18 13:43:10 -0800 |
| commit | 20fbb79825f30391c91664775cddf060ec3992f8 (patch) | |
| tree | dd59903dbde35350daaae1fe62900c41cd1e4713 /preloaded-classes | |
| parent | 14d9431a5ff69d0b0fad7adbe3404a052aa9251b (diff) | |
| parent | a351b7f0c6a2f8240f6426cfdd3499ac0618bc8f (diff) | |
| download | frameworks_base-20fbb79825f30391c91664775cddf060ec3992f8.zip frameworks_base-20fbb79825f30391c91664775cddf060ec3992f8.tar.gz frameworks_base-20fbb79825f30391c91664775cddf060ec3992f8.tar.bz2 | |
resolved conflicts for merge of a351b7f0 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/preloaded-classes b/preloaded-classes index 907938b..55b7733 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -369,7 +369,6 @@ android.text.style.UpdateAppearance android.text.style.UpdateLayout android.text.style.WrapTogetherSpan android.text.util.Linkify -android.text.util.Regex android.util.AndroidRuntimeException android.util.AttributeSet android.util.DisplayMetrics |