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

* commit '6c450101753d0219b151e79007bcded1bfbb058b':
  DO NOT MERGE Cherry-pick dataSpace and BufferItem changes
This commit is contained in:
Eino-Ville Talvala 2015-04-06 21:15:33 +00:00 committed by Android Git Automerger
commit 4019179991

Diff Content Not Available