summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-04-01 18:43:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 18:43:23 +0000
commit7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e (patch)
tree4c2cbb428c9d0fdafec7ce53aa52da292fee72ec /services
parent2c0e26fe42771b7fae55f139c504c129b4a9748d (diff)
parent175802940e30d2ae7bbf36656f08d47067c0a069 (diff)
downloadframeworks_av-7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e.zip
frameworks_av-7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e.tar.gz
frameworks_av-7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e.tar.bz2
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
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions