tree eadd8312dfd4eaeabc1a5403a5bd25c87c27a7f6
parent 309c5018d1a7680af5ed2b0af8f2530b8db71f7a
parent c07cba5fcbe41974f104704f8608708c836030de
author Mark Salyzyn <salyzyn@google.com> 1424898659 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424898659 +0000

am c07cba5f: am eb77dbf0: Merge "Revert "manta: batching and timestamp issues""

* commit 'c07cba5fcbe41974f104704f8608708c836030de':
  Revert "manta: batching and timestamp issues"