diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-01-15 14:06:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-15 14:06:11 +0000 |
| commit | 109538fe13a127147579aa7ade0fe444e4e26da9 (patch) | |
| tree | b9b654fcc7e6a8ca2c680e05d398de903a3e65ae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3585a349520df2bd8de9071944d0a054783c76e9 (diff) | |
| parent | 48824f7edeef72a0089c90b6ed3248d28f947673 (diff) | |
Merge "Do not remove the k_k until all users are unlocked" am: 4d20410bf4 am: e013e0b98a am: 48824f7ede
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550295
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8dc48481b15486137665734e571408df4e6af60
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions