diff options
| author | Alison Cichowlas <asc@google.com> | 2020-09-23 16:13:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 16:13:49 +0000 |
| commit | 656a7fd42a2e720cf974680260fb3454ab9ca8dd (patch) | |
| tree | 6b56d9c4426bfb2f8a8c13bc1b0480d9bbc1eee0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 77136fec4a8e8ab71ec59894b474742980b3f824 (diff) | |
| parent | e76866f0bcdb7b3499a8911709578a41f1e06535 (diff) | |
[automerger skipped] Merge "Add a flag to change the screenshot keychord delay" into rvc-qpr-dev am: d6e25d49fd am: e76866f0bc -s ours
am skip reason: Change-Id I2f86abe0332f8072ab4f53baa55f1999aed3865a with SHA-1 6e44e9d5b4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12557347
Change-Id: I01fe4f8ccc807eeadeac59c3b9f92a312836c0a2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions