| commit | e41b5f31148f9cfb7316295c900c7d3c695510b2 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Tue Apr 07 21:12:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 07 21:12:48 2015 +0000 |
| tree | ec9f4cf20fe5eb1b64d452fd369b6d27547b7a5e | |
| parent | ff458b7e24a8e23f42d9d21687e3c1f946b01a87 [diff] | |
| parent | e5eda367571db5894024d0d71e3831484ef53141 [diff] |
am e5eda367: (-s ours) am afc7b857: am e849af87: Cherry-pick two BufferItem changes * commit 'e5eda367571db5894024d0d71e3831484ef53141': Cherry-pick two BufferItem changes