tree eadd8312dfd4eaeabc1a5403a5bd25c87c27a7f6
parent b14cf2eb3730efe4f7cf5946ece61ec6b611766f
parent eb77dbf00ed67a8e12ab376921300883f6975ce2
author Mark Salyzyn <salyzyn@google.com> 1424897871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424897871 +0000

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

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