tree 61dc65c27a80193d3a20a13960c3dfec8467f8da
parent 5a1695ae86cd6901d4bd825a85923d8e6a8056dd
parent e70d3877a2585b77e544d39c9fa03e8ff4a9e928
author Mark Salyzyn <salyzyn@google.com> 1424892145 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424892145 +0000

am e70d3877: Merge "manta: batching and timestamp issues"

* commit 'e70d3877a2585b77e544d39c9fa03e8ff4a9e928':
  manta: batching and timestamp issues