| commit | d6d2886f081666cf108536e47d3789fe58440ca6 | [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 | 098417931546946efcd3ae0cd964b2d743dc5d89 | |
| parent | a98b46e181116784141d2df9af8119233ae825d3 [diff] | |
| parent | e2fa4bc12c06c140d227afef71228103963effdc [diff] |
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342' * commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342': Make disabled TextViews uneditable