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

* commit 'e70d3877a2585b77e544d39c9fa03e8ff4a9e928':
  manta: batching and timestamp issues
tree: 61dc65c27a80193d3a20a13960c3dfec8467f8da
  1. 60xx/
  2. 6515/
  3. 65xx/
  4. Android.mk