diff options
author | Dan Stoza <stoza@google.com> | 2015-04-01 18:34:40 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 18:34:40 +0000 |
commit | 175802940e30d2ae7bbf36656f08d47067c0a069 (patch) | |
tree | 4c2cbb428c9d0fdafec7ce53aa52da292fee72ec /include/camera/CameraMetadata.h | |
parent | 1eedd9aedb99d067db8b52077d156ada76333eba (diff) | |
parent | 8b0b1f77606c3e81b9a5d5d2b78fdac68df33ada (diff) | |
download | frameworks_av-175802940e30d2ae7bbf36656f08d47067c0a069.zip frameworks_av-175802940e30d2ae7bbf36656f08d47067c0a069.tar.gz frameworks_av-175802940e30d2ae7bbf36656f08d47067c0a069.tar.bz2 |
am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem"
* commit '8b0b1f77606c3e81b9a5d5d2b78fdac68df33ada':
DO NOT MERGE libstagefright: Stop using IGBC::BufferItem
Diffstat (limited to 'include/camera/CameraMetadata.h')
0 files changed, 0 insertions, 0 deletions