tree c053ec96259190d951e68a4c926a248a992fbe72
parent 67d9aa15b6c6217a7d3b7b017924af132d048e56
parent b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9
author Dianne Hackborn <hackbod@google.com> 1259880766 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259880766 -0800

am b2e49a23: Add API level 7.

Merge commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9' into eclair-mr2

* commit 'b2e49a2319a40976a60d51d9a7c55d20f0b2d0e9':
  Add API level 7.