tree f43f4555b4fe3f2f34f1af72959418d206086fb5
parent ccbf4c282f6d27602896b812485b41b74eaf8c6d
parent aad9c8d1100a7d88f0d6e4154e74ecf56e1fe745
author Android (Google) Code Review <android-gerrit@google.com> 1259969999 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1259969999 -0800

Merge change Iaad9c8d1 into eclair-mr2

* changes:
  Restore 7.xml.