diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-21 13:47:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 13:47:42 -0700 |
| commit | 276bb3a32794097918671780ea9d39aea522aa41 (patch) | |
| tree | 38831a4b1ef7f6f85770b9f33c68c499fda6cf11 /opengl | |
| parent | 46cb1d9602905061ff2a9ba3bc7654bfe94183db (diff) | |
| parent | 843ff92bb0f2ff259145fd90333b0a50d8bbf342 (diff) | |
| download | frameworks_base-276bb3a32794097918671780ea9d39aea522aa41.zip frameworks_base-276bb3a32794097918671780ea9d39aea522aa41.tar.gz frameworks_base-276bb3a32794097918671780ea9d39aea522aa41.tar.bz2 | |
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'
* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
Make disabled TextViews uneditable
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions