summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2014-12-10 03:32:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-10 03:32:27 +0000
commitf44bdeb7aff53309ed09fdbf48be526c58f7964b (patch)
treee93b36f6d900d3f44e0189520cc23379acc9c32a /media
parent3b46819eb0dd9ea510619c351d7ffdc244ed511d (diff)
parent61697a5c1ddd2ad882a889474822851187734cf4 (diff)
downloadframeworks_av-f44bdeb7aff53309ed09fdbf48be526c58f7964b.zip
frameworks_av-f44bdeb7aff53309ed09fdbf48be526c58f7964b.tar.gz
frameworks_av-f44bdeb7aff53309ed09fdbf48be526c58f7964b.tar.bz2
am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1-dev
* commit '61697a5c1ddd2ad882a889474822851187734cf4': Camera3Device: support shutter after result
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions