diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-10-22 13:20:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 13:20:02 +0000 |
| commit | 617a0256ad5f1c55c5b9fd1c9d9ca9cffd5ae55a (patch) | |
| tree | 89169dd0d3e1f1d8e97e8b28015befa386b8900e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 91581bf1bbb41300719b4c2af7d25d6a8073e514 (diff) | |
| parent | 944c797ccfedc4c7c51bacb17d218539edbfdef7 (diff) | |
[automerger skipped] Merge "Add HANDLE_CAR_MODE_CHANGED permission" am: 2538a16428 -s ours am: 8ab8d927f7 -s ours am: 5f5a89bcdf -s ours am: 944c797ccf -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: I53e8d6513a53e84ed92c0452b81cb41cd72bcb2e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions