diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-24 04:07:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 04:07:18 +0000 |
| commit | 78aedaf5f6bacef0cbe24388879fca5f6281660e (patch) | |
| tree | 3eb5e22c14837f9af5a3115e3260fd8f3e14b98f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0e5a5161e6999a58a86acd404ee1a229e180647d (diff) | |
| parent | dc9fcc3a55e734b2aab1e4754db3b588e1fbfc80 (diff) | |
am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit 'dc9fcc3a55e734b2aab1e4754db3b588e1fbfc80':
MediaPlayer subtitle controller: use debug log instead of warning
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions