diff options
| author | Zimuzo <zezeozue@google.com> | 2019-06-14 17:46:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 17:46:25 -0700 |
| commit | cb079e480d0efacdfa05b656fcb045d76cd9d23d (patch) | |
| tree | 23e8dc6582258627937ce1369f0b028d96bbf73c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6380bcddf92011395807f72c6e5f89c3b0c4b8ff (diff) | |
| parent | b9da94daf316c865cddbcd06f1f0697508660fc3 (diff) | |
[automerger skipped] Merge "Pause watchdog triggering on the main thread during package scan" into qt-dev am: a9ab8516ca am: 4d8e3465b4
am: b9da94daf3 -s ours
am skip reason: change_id Ia5b2b5741194a33f7cd09e79c0904696ce546026 with SHA1 e5cc6abdc1 is in history
Change-Id: Icf7fee606e3c657462bcce09455f1ebcb6a9300f
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions