| commit | 32f0b5b8046667579c0decd3de18d1c2c587e615 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Mon Apr 06 23:28:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 23:28:16 2015 +0000 |
| tree | 12b3c3b311d02e9ca566ff24443d266129e0adec | |
| parent | 177861d98f0a44bb94c6d9a2fed176fa4a226dbf [diff] | |
| parent | 4019179991bae66f72bae8e81c0f2399da4ee85e [diff] |
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