OSDN Git Service

am ebc910da: Merge change Iaad9c8d1 into eclair-mr2
authorAndy McFadden <fadden@android.com>
Fri, 4 Dec 2009 23:42:43 +0000 (15:42 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 23:42:43 +0000 (15:42 -0800)
Merge commit 'ebc910da96f4dbb036e16971c1041f8287342aa4' into eclair-mr2-plus-aosp

* commit 'ebc910da96f4dbb036e16971c1041f8287342aa4':
  Restore 7.xml.


Trivial merge