am ebc910da: Merge change Iaad9c8d1 into eclair-mr2

Merge commit 'ebc910da96f4dbb036e16971c1041f8287342aa4' into eclair-mr2-plus-aosp

* commit 'ebc910da96f4dbb036e16971c1041f8287342aa4':
  Restore 7.xml.