tree 1a81b51e29fa8345f963de00cd427608a304bea9
parent c07cba5fcbe41974f104704f8608708c836030de
parent 7936bb838485da38cc64d1a5e15a80fd5a0cc09c
author Mark Salyzyn <salyzyn@google.com> 1424904658 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424904658 +0000

am 7936bb83: Merge "manta: batching and timestamp issues"

* commit '7936bb838485da38cc64d1a5e15a80fd5a0cc09c':
  manta: batching and timestamp issues