tree 126b42b0f2a4cc6ab33dc74fb2a1e0d4398ec3bb
parent ba907a66e7167c8e9e3c4b33590f0305b0ade456
parent e0963f27096b2433f56d4929c0461c92a683659b
author Michael Jurka <mikejurka@google.com> 1295365962 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295365962 -0800

am e0963f27: am f4ffdc63: Merge "removed some more unnecessary code" into honeycomb

* commit 'e0963f27096b2433f56d4929c0461c92a683659b':
  removed some more unnecessary code