am 40191799: (-s ours) am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes

* commit '4019179991bae66f72bae8e81c0f2399da4ee85e':
  DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
This commit is contained in:
Eino-Ville Talvala 2015-04-06 23:28:16 +00:00 committed by Android Git Automerger
commit 32f0b5b804

Diff Content Not Available