OSDN Git Service

am fc24dc1a: am 787c0d04: merge in klp-release (no-op)
authorEd Heyl <edheyl@google.com>
Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)
* commit 'fc24dc1a2e2ba8d74bfadfadb01d12a542828561':
  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


Trivial merge