tree 377eb017c7f7ea200040b88981db97e9e8292b5a
parent 382ec478d1ed1576d25d51205a1c67b190174172
parent 06522ef517196062299852d59593eba0ea2be3c0
author Elliott Hughes <enh@google.com> 1428613839 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428613839 +0000

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

* commit '06522ef517196062299852d59593eba0ea2be3c0':
  Remove some commented-out code.