tree 05219604fb3cf04df4c8e7e13ef70285f618f53d
parent 04a30bfe92f41a5d84dfa180294686e856b30b56
parent 72356f14525d260f0e8ed38bd9f8376f535c02d0
author Elliott Hughes <enh@google.com> 1385103603 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385103603 -0800

am 72356f14: am 6b49c024: am 740edfcf: Merge "Remove an outdated hack."

* commit '72356f14525d260f0e8ed38bd9f8376f535c02d0':
  Remove an outdated hack.