| commit | 276bb3a32794097918671780ea9d39aea522aa41 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 21 13:47:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:47:42 2010 -0700 |
| tree | 38831a4b1ef7f6f85770b9f33c68c499fda6cf11 | |
| parent | 46cb1d9602905061ff2a9ba3bc7654bfe94183db [diff] | |
| parent | 843ff92bb0f2ff259145fd90333b0a50d8bbf342 [diff] |
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342' * commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342': Make disabled TextViews uneditable