| commit | 86f76208f0ada2148fda43d522f7933a0c7bf476 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Fri Oct 04 11:09:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 04 11:09:01 2013 -0700 |
| tree | 3b5b4cab4b16bb804afd76981e21f6a806d808ae | |
| parent | 794c5ba973f6d107a8277f3f389cb3051c6ce5d7 [diff] | |
| parent | 04e6ab6e27c39604a7029467161a90af78ecdf07 [diff] |
am 04e6ab6e: am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev * commit '04e6ab6e27c39604a7029467161a90af78ecdf07': media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams