diff options
| author | Gloria Wang <gwang@google.com> | 2011-09-15 17:38:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-15 17:38:36 -0700 |
| commit | 7eaedf93ca8e46d0360e6d904abf38d969daa3f1 (patch) | |
| tree | d0f424a32fafc9f5c41a4e9b243b6d752ac09d85 /core/java/android/widget/TextView.java | |
| parent | 5adea623ee62d811a7772fcd7a6dcea223d0c00d (diff) | |
| parent | 62c24d7bfa5a88655ba9981dba2a565c1136a255 (diff) | |
| download | frameworks_base-7eaedf93ca8e46d0360e6d904abf38d969daa3f1.zip frameworks_base-7eaedf93ca8e46d0360e6d904abf38d969daa3f1.tar.gz frameworks_base-7eaedf93ca8e46d0360e6d904abf38d969daa3f1.tar.bz2 | |
am 62c24d7b: (-s ours) Merge "Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer\'s _release. Related to bug 5252296." into ics-factoryrom
* commit '62c24d7bfa5a88655ba9981dba2a565c1136a255':
Cherry-pick from master. Do not merge. Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296.
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions