summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-04-01 19:28:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 19:28:11 +0000
commitd618d8355e02de336ccd455d2f255957b8da913b (patch)
tree4e33349f1bd8f4416bbdcf4f248e2aa78d0785c1
parent7094ec6531ead3c6ed8dbcea1f834e84ad0384ea (diff)
parent7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e (diff)
downloadframeworks_av-d618d8355e02de336ccd455d2f255957b8da913b.zip
frameworks_av-d618d8355e02de336ccd455d2f255957b8da913b.tar.gz
frameworks_av-d618d8355e02de336ccd455d2f255957b8da913b.tar.bz2
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
0 files changed, 0 insertions, 0 deletions