tree 813424245743ba08c72c2a297180240559167cb7
parent 5482eca13aa6070e098afb35c91401e3dbd7ced2
parent 4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf
author The Android Open Source Project <initial-contribution@android.com> 1275489660 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1275489660 -0700

am 4bdec4ab: merge from open-source master

Merge commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf' into kraken

* commit '4bdec4ab5d3deb28e29c460100a4e3c0b25d37cf':
  removed unused imports