tree 56f771d1504054175f116288909d3589f695e658
parent 45517b17de53f6eeccf3373923c300f2ab152bfb
parent a01902ffbd51d4952efb0794853a1c0dc2f8c353
author Michael Jurka <mikejurka@google.com> 1322535236 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322535236 -0800

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

* commit 'a01902ffbd51d4952efb0794853a1c0dc2f8c353':
  Clean up unused code and import declarations