commit | fc24dc1a2e2ba8d74bfadfadb01d12a542828561 | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Wed Oct 16 17:56:41 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 16 17:56:41 2013 -0700 |
tree | 649155f2de2013df5deccb18710d94103048f49c | |
parent | dddafa84dcbd85c11a732e7553d0b884e5a08c27 [diff] | |
parent | 787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da [diff] |
am 787c0d04: merge in klp-release (no-op) * commit '787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da': Camera: Skip AE precapture when possible Cleanup openRecord error handling TimedEventQueue takes a wake lock fix offload audio effect proxy implementation uuid MediaCodecInfo: report supported color formats for non-native-window mode Camera2 API: Hack: Always use async mode with GLConsumer AudioTrack: fix music resume