| commit | 04e6ab6e27c39604a7029467161a90af78ecdf07 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Thu Oct 03 15:40:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 03 15:40:30 2013 -0700 |
| tree | 64a51c868ca7feb2ec36591cd1233ae80b14ce7f | |
| parent | 6be1d210eef392f5745d58a0033572b1af4b2f2a [diff] | |
| parent | b1f94ef3f97bd20b928cf980791526861650eab9 [diff] |
am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev * commit 'b1f94ef3f97bd20b928cf980791526861650eab9': media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams