am 19e0db20: am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
am 19e0db20: am ebc910da: Merge change Iaad9c8d1 into eclair-mr2

Merge commit '19e0db20100753dd347ec5203cd0226f55f09e2a'

* commit '19e0db20100753dd347ec5203cd0226f55f09e2a':
  Restore 7.xml.

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