tree 1211b46c02eb5348dca9395a84af5a17ceda2055
parent bc7d1d01640d44c1b4f1b468e6365abc4e340bf3
parent fd1e757ff2095cb1c41fb0f5bb39d6b8461617ea
author Tom Taylor <tomtaylor@google.com> 1261439081 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1261439081 -0800

am fd1e757f: Update imports to android-common

Merge commit 'fd1e757ff2095cb1c41fb0f5bb39d6b8461617ea' into eclair-mr2-plus-aosp

* commit 'fd1e757ff2095cb1c41fb0f5bb39d6b8461617ea':
  Update imports to android-common