tree ae116c59e41da450c1c6ab5e77d35dc8af33b035
parent 4c1ab8f2583eaa570d8e49bef9ee824bfcf7e81e
parent ff6f3fe4482bcad900bce2e78204ad5cb466bbf9
author Dianne Hackborn <hackbod@google.com> 1255061211 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255061211 -0700

am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.

Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-plus-aosp

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.