summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-08-21 20:47:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-21 20:47:36 +0000
commit32a5c4fbedbccdeaa89a81ce1097961f8a9cfd74 (patch)
tree903b0a6e352c23f5cc02cbd9c10ee55b0457380c /include/camera
parentd07644fe9a861e465b3b8b9e137446b261cdf654 (diff)
parent39515ddcc04096824889eac8125ec3527230c3eb (diff)
downloadframeworks_av-32a5c4fbedbccdeaa89a81ce1097961f8a9cfd74.zip
frameworks_av-32a5c4fbedbccdeaa89a81ce1097961f8a9cfd74.tar.gz
frameworks_av-32a5c4fbedbccdeaa89a81ce1097961f8a9cfd74.tar.bz2
am 39515ddc: am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
* commit '39515ddcc04096824889eac8125ec3527230c3eb': DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessage
Diffstat (limited to 'include/camera')
0 files changed, 0 insertions, 0 deletions