OSDN Git Service

resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp
authorGilles Debunne <debunne@google.com>
Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)
committerGilles Debunne <debunne@google.com>
Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)
commit816dd3d443108b473965f97123eef7300f53615f
treef579f49872f12f8f1d5fb93186159e969046a64b
parent206c62ed34dc8a48fd6c907d95456226949f42dd
parent9c06c0ffc9fe24c7b8bbeca53bce76aca9d1ac4f
resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da
core/java/android/widget/TextView.java