diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:40:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 18:40:52 +0000 |
| commit | 0e8fd23dc910f20ebfe540b2ad47eb83782a8d1d (patch) | |
| tree | 2ba4e472ccef829567d5d76b698ce6b166754b74 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ffa44cf2a2c25f74344e27fec8ebab5b221d53a8 (diff) | |
| parent | d88fcacbd1d9204cf337c3d35671e841a508a775 (diff) | |
Merge "Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev am: 0d425c2e4e am: 261faac8ba" into rvc-d1-dev-plus-aosp am: c763b3d2ce am: d88fcacbd1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702453
Change-Id: I21b4bbc74a0ccc264a500da0b590567c0b7d8ee7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions