OSDN Git Service

am 04e6ab6e: am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdapti...
authorLajos Molnar <lajos@google.com>
Fri, 4 Oct 2013 18:09:01 +0000 (11:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Oct 2013 18:09:01 +0000 (11:09 -0700)
commit86f76208f0ada2148fda43d522f7933a0c7bf476
tree3b5b4cab4b16bb804afd76981e21f6a806d808ae
parent794c5ba973f6d107a8277f3f389cb3051c6ce5d7
parent04e6ab6e27c39604a7029467161a90af78ecdf07
am 04e6ab6e: am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev

* commit '04e6ab6e27c39604a7029467161a90af78ecdf07':
  media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams