am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp
am 843ff92b: resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp

Merge commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342'

* commit '843ff92bb0f2ff259145fd90333b0a50d8bbf342':
  Make disabled TextViews uneditable

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base