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