am 8805dc13: Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1
am 8805dc13: Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1

* commit '8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
  b/5309787 Add new columns to hidden list of read only fields

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