tree 3a24aac62b9e7883c4e4fa9bcae6e0031cbfaaf9
parent 32c66ee4976857c0db80ebfcfe42d7627dc9d2a2
parent ebc910da96f4dbb036e16971c1041f8287342aa4
author Andy McFadden <fadden@android.com> 1259970163 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259970163 -0800

am ebc910da: Merge change Iaad9c8d1 into eclair-mr2

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

* commit 'ebc910da96f4dbb036e16971c1041f8287342aa4':
  Restore 7.xml.