diff options
| author | Mark Chien <markchien@google.com> | 2019-08-01 19:24:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-01 19:24:36 -0700 |
| commit | 388295e97f1cb5d477f3d83dbc97ab8340217215 (patch) | |
| tree | 9800340bf40265dbb528bead4b826a24dde8722a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 00de76a6c1ff3b97031d539ceb9978504a5a6113 (diff) | |
| parent | 5d6e98773f80b6922a31485c7bbcecde19118f67 (diff) | |
[automerger skipped] Merge "Fix the race between entitlement start/stop" into qt-r1-dev
am: 5d6e98773f -s ours
am skip reason: change_id I63f858356b4543b5bdda41d03e45adc944b86da3 with SHA1 4f95975c77 is in history
Change-Id: Ia4c2a0f1e330916e0f841301ff35b81e04d88054
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions