tree 2d91069002cde386e45dc327f7edd4718ae533b0
parent 8e3321c5853aa91353b8545ed66760d95c11720b
parent f482fa848055925d8abe4a8a7f4801bc6c8fc291
author Geremy Condra <gcondra@google.com> 1377553785 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377553785 -0700

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

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