| commit | 7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Wed Apr 01 18:43:23 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 18:43:23 2015 +0000 |
| tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec | |
| parent | 2c0e26fe42771b7fae55f139c504c129b4a9748d [diff] | |
| parent | 175802940e30d2ae7bbf36656f08d47067c0a069 [diff] |
am 17580294: am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem" * commit '175802940e30d2ae7bbf36656f08d47067c0a069': DO NOT MERGE libstagefright: Stop using IGBC::BufferItem