diff options
author | Sarah Chin <sarahchin@google.com> | 2020-10-22 10:54:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 10:54:24 +0000 |
commit | 5f5a89bcdfb5790e6aafd7a470c2c994e07244fd (patch) | |
tree | 7f7040e2c1663ba4904ec4c5768eeb7bd21ac9c5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 41f955e8b685e2ad30c756b4819831045b8d1636 (diff) | |
parent | 8ab8d927f7f4d6d7660cc6aaeb78ecbe5f48079d (diff) |
[automerger skipped] Merge "Add HANDLE_CAR_MODE_CHANGED permission" am: 2538a16428 -s ours am: 8ab8d927f7 -s ours
am skip reason: Change-Id If3ad86a2564ce3ba53afea44e8ad5bf02b8d51e0 with SHA-1 c363a3a148 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1415309
Change-Id: I7f522e56487b96464d094ed5b60f7cf7a424f16f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions