diff options
| author | Zimuzo <zezeozue@google.com> | 2019-06-14 17:45:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 17:45:43 -0700 |
| commit | d869485295435c35cf4297040ad48c856eadefa0 (patch) | |
| tree | 237989974e12e97827842ebb56bd0be8366a018e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a18b4d8df891847dd0afc5576378a904349ce5c (diff) | |
| parent | 5dc10505c1a0c7ba1208e5bf850e216d2cd76471 (diff) | |
[automerger skipped] Merge "Pause watchdog triggering on the main thread during package scan" into qt-dev am: a9ab8516ca
am: 5dc10505c1 -s ours
am skip reason: change_id Ia5b2b5741194a33f7cd09e79c0904696ce546026 with SHA1 ab2fc348fd is in history
Change-Id: I8634f498df9a79db4997fce5901f99c05fdb241f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions