diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-14 19:10:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-14 19:10:13 +0000 |
| commit | 7fc32c4791d4646b9cdfaac9194b90911cfaa25e (patch) | |
| tree | 6e912b488b0f584869fa5b9c8437e7ee7ad265cf /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9a47c4b5506b60393cb9caeb6a1f3ca204c78e84 (diff) | |
| parent | 3b6470a2357fb580137ba1d6922425ac7bd23730 (diff) | |
[automerger skipped] Merge "Merge "Remove car permissions from common shell package" into rvc-qpr-dev am: d029933aa5" into rvc-qpr-dev-plus-aosp am: 3b6470a235 -s ours
am skip reason: Change-Id I5a3b2086f605ba31f4231ec425cb2cb7c51ea7e6 with SHA-1 89e5cfe9d8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330563
Change-Id: I6216318eb3b2d3410f029f2d51d54bc8842c605a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions