tree 7c395dc45e732e921d65fe0baaa0315b954fbc87
parent 16a0cbaa83dc653a5b6a0fa62088f08cdfa4dedc
parent b6a971962acdf2684fd98658ec6fe6aa9952d84b
author Elliott Hughes <enh@google.com> 1344982118 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344982118 -0700

am b6a97196: Merge "More cleanup."

* commit 'b6a971962acdf2684fd98658ec6fe6aa9952d84b':
  More cleanup.