summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2014-12-10 21:56:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 21:56:06 +0000
commit2a5b6e4c983be6ea85d41f235b2e4b250b37b2bd (patch)
tree57b44e6a560b2fad66726496eb9a92d1a9d07629 /media
parent1fcae5927d4354b4e963c233bf77246631a852c5 (diff)
parentf44bdeb7aff53309ed09fdbf48be526c58f7964b (diff)
downloadframeworks_av-2a5b6e4c983be6ea85d41f235b2e4b250b37b2bd.zip
frameworks_av-2a5b6e4c983be6ea85d41f235b2e4b250b37b2bd.tar.gz
frameworks_av-2a5b6e4c983be6ea85d41f235b2e4b250b37b2bd.tar.bz2
am f44bdeb7: am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1-dev
* commit 'f44bdeb7aff53309ed09fdbf48be526c58f7964b': Camera3Device: support shutter after result
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions