| commit | d618d8355e02de336ccd455d2f255957b8da913b | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Wed Apr 01 19:28:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 19:28:11 2015 +0000 |
| tree | 4e33349f1bd8f4416bbdcf4f248e2aa78d0785c1 | |
| parent | 7094ec6531ead3c6ed8dbcea1f834e84ad0384ea [diff] | |
| parent | 7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e [diff] |
am 7f6655df: (-s ours) am 17580294: am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem" * commit '7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e': DO NOT MERGE libstagefright: Stop using IGBC::BufferItem