tree 9a29d3597460d1081f09454ecb0b04c27050385e
parent ad37305edb98df08d71fd27e7d1df6a082a76da3
parent 0187d84264fb6cf67650354c8c5da0a0712dbb0b
author Dianne Hackborn <hackbod@google.com> 1254882161 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254882161 -0700

am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5