diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-07-24 03:12:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:12:50 +0000 |
| commit | 938e8e302d45ecfe2d2527ce26edc721c9fdb4fb (patch) | |
| tree | 557e8692beb027a16b7dc2a2968d3ab53a68bdcd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ba771bbcb7043dd9c5d813a4502f25f422e4b8c (diff) | |
| parent | 9f4b7a47a7887ea04f568cfc69bbf67d298e436e (diff) | |
am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev
* commit '9f4b7a47a7887ea04f568cfc69bbf67d298e436e':
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