diff options
| author | Robert Shih <robertshih@google.com> | 2016-06-01 22:18:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 22:18:00 +0000 |
| commit | e188177c21e65545cb29c972a0fe06457669512a (patch) | |
| tree | 066640fb36397a2d44d94f990631bf5b67ea74a3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 45fea4d6e9732d12fcc63243c678c405d7efae40 (diff) | |
| parent | 4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd (diff) | |
resolve merge conflicts of d579be0 to nyc-dev-plus-aosp
am: 4c3d43d2c2
* commit '4c3d43d2c2ef9f9176fae6d897d01ec57e3970cd':
Fix deadlock when showing subtitles MediaPlayer
Change-Id: I8e0bfa7f23437ba3fe75283d6020b446ea82d55c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions