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