| commit | 4019179991bae66f72bae8e81c0f2399da4ee85e | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Apr 06 21:15:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 21:15:33 2015 +0000 |
| tree | 5f0676387236e3c7ba367e6cdb4d3694e097bcb8 | |
| parent | 2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9 [diff] | |
| parent | 6c450101753d0219b151e79007bcded1bfbb058b [diff] |
am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes * commit '6c450101753d0219b151e79007bcded1bfbb058b': DO NOT MERGE Cherry-pick dataSpace and BufferItem changes