Commits
Jean-Baptiste Queru authored and Android Git Automerger committed 276bb3a3279M
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342' * commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342': Make disabled TextViews uneditable
Showing diff to46cb1d96029