commit a6b620cbaceb493959092d058498d55d4a241a4a
author The Android Automerger <android-build@google.com> Fri May 23 00:10:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 23 00:10:55 2014 +0000
tree cc9613e8ac7b52dac124f078497227881329de8e
parent 5806b3533437e3d83208e8e9d6bd74ed304e51ec
parent 24adc0400381612a97e8b30d83484f4107819d5c

am 24adc040: merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb

* commit '24adc0400381612a97e8b30d83484f4107819d5c':
  Revert "camera: Fix setParameters for Preview FPS single/range values"
  stagefright: allow for minUndequeuedBufs to be one less
  camera3: Remove old vendor tag ops dependencies.
  Revert "Convert AudioFlinger mSinkBuffer to flexible format"
  Fix freeze on pause
  audioflinger: fix race condition in SyncEvent callback
  Support "data:" URIs again in mediaplayer...
  frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default
  libstagefright: Delay release of wakelock in TimedEventQueue
  Revert "stagefright: fix TimedEventQueue wakelock"