tree f8f6ac51130c3f67acce7f8b2e6267d1dc1eb0b1
parent acbdb76a6bf9953e8e80bd59a41f456c27ddfa25
parent 6c8d6123ba22c8bd523cfaf46196385cb79290ee
author Michael Jurka <mikejurka@google.com> 1353100538 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353100538 -0800

am 6c8d6123: am 3c42e118: Merge "Cleaning up unused code" into jb-mr1.1-dev

* commit '6c8d6123ba22c8bd523cfaf46196385cb79290ee':
  Cleaning up unused code