tree 56f771d1504054175f116288909d3589f695e658
parent a955f6a977d46f84a6d9a2fbfcf3ed6c967cf6bb
parent 09cecf6d853d38c48424f0f44e35708e262c5c78
author Michael Jurka <mikejurka@google.com> 1322535094 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322535094 -0800

am 09cecf6d: am 7e38964c: Merge "Clean up unused code and import declarations" into ics-mr1

* commit '09cecf6d853d38c48424f0f44e35708e262c5c78':
  Clean up unused code and import declarations