OSDN Git Service

am 8a6c3ba4: am a676e96c: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Wed, 9 Oct 2013 16:12:05 +0000 (09:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 16:12:05 +0000 (09:12 -0700)
* commit '8a6c3ba4c0fff03b700cf6b1d1386b3c9fc2f3f6':
  Camera2/3: For still captures, use widest FPS range available.
  camera2: Tell all streams to ignore global device UI rotation
  Workaround slow AudioTrack destruction
  Partial fix for SoundPool not terminating
  Fix MediaDrm cts tests


Trivial merge