tree 2766e526a84392e7b3e41dc33660be2443333f04
parent 2724d8c4ac1a8eea593425d682e7244a8e5cc9da
parent d7a9f708870ebd82bc57e478541068bb7ed987c4
author Geremy Condra <gcondra@google.com> 1377553653 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377553653 -0700

am d7a9f708: Merge "Hmm, contrary to Deckard\'s assurances, this broke internally. Reverting."

* commit 'd7a9f708870ebd82bc57e478541068bb7ed987c4':
  Hmm, contrary to Deckard's assurances, this broke internally. Reverting.