tree 7bb1ce632f85743fd7d8824142bd7139045a4656
parent e9b013588baf2050ca26df5330d133411ecd8975
parent b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9
author Dianne Hackborn <hackbod@google.com> 1259880767 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259880767 -0800

am b2e49a23: Add API level 7.

Merge commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9' into eclair-plus-aosp

* commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9':
  Add API level 7.