tree 377eb017c7f7ea200040b88981db97e9e8292b5a
parent 9e225cb8032efefec4dce6de2dd91fa6e3658346
parent 0c23c97c78211bc98c3dadd7f613e764e183a0ea
author Elliott Hughes <enh@google.com> 1428615110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428615110 +0000

am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code."

* commit '0c23c97c78211bc98c3dadd7f613e764e183a0ea':
  Remove some commented-out code.