tree 081464e93c7c8a56376e301d438157c1df863c72
parent 8d745304ad9b5215a3c6e833b820305bacc876c6
parent fab87998b50c997ba4e506a080d01f606615eb19
author Sriram Raman <sriramkraman@google.com> 1250131460 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250131460 -0700

am fab87998: (-s ours) Fix the platform version (1.6 now) and sdk version (4)

Merge commit 'fab87998b50c997ba4e506a080d01f606615eb19'

* commit 'fab87998b50c997ba4e506a080d01f606615eb19':
  Fix the platform version (1.6 now) and sdk version (4)