OSDN Git Service

am b68c1661: am 580ed263: Merge "stagefright: enable adaptive playback based on codec...
authorLajos Molnar <lajos@google.com>
Fri, 4 Oct 2013 18:08:26 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 18:08:26 +0000 (11:08 -0700)
* commit 'b68c16616765576b411aa8a5a5cb809e09329d8f':
  stagefright: enable adaptive playback based on codec format key


Trivial merge