diff options
author | Chien-Yu Chen <cychen@google.com> | 2014-12-09 23:17:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:17:49 +0000 |
commit | 61697a5c1ddd2ad882a889474822851187734cf4 (patch) | |
tree | 5fe4dffd3b11240e9e786ee7a2aeca33c9aae7fc /media/libmedia/AudioTrack.cpp | |
parent | 2340e5a83402cb239934e0bf1dbe581aeea37aa5 (diff) | |
parent | 9cea7aa494f6f93a473cab936af79868fc8efea6 (diff) | |
download | frameworks_av-61697a5c1ddd2ad882a889474822851187734cf4.zip frameworks_av-61697a5c1ddd2ad882a889474822851187734cf4.tar.gz frameworks_av-61697a5c1ddd2ad882a889474822851187734cf4.tar.bz2 |
am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1-dev
* commit '9cea7aa494f6f93a473cab936af79868fc8efea6':
Camera3Device: support shutter after result
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
0 files changed, 0 insertions, 0 deletions