tree ccd49fc64f76444e2dd62c7c13e11964ee0273dc
parent 89a3543568ffedb54473f961f36f17d211d9c7e1
parent 63696738e5d0684fb1e769c541fba2e552c5110a
author Elliott Hughes <enh@google.com> 1344982251 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344982251 -0700

am 63696738: am b6a97196: Merge "More cleanup."

* commit '63696738e5d0684fb1e769c541fba2e552c5110a':
  More cleanup.