diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-24 05:17:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 05:17:03 +0000 |
| commit | 89e2e4e37941f4dc1a2e1a33c7271b7c5247b9e1 (patch) | |
| tree | 130b330ea24d5db5f7aa40275abb0a3a9b99a7e2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 66a36750135789aa952f2543842aa2481aa2da03 (diff) | |
| parent | 78aedaf5f6bacef0cbe24388879fca5f6281660e (diff) | |
am 78aedaf5: am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '78aedaf5f6bacef0cbe24388879fca5f6281660e':
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