diff options
| author | Nathan Harold <nharold@google.com> | 2020-06-19 20:56:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 20:56:19 +0000 |
| commit | 1fe0bcad317f49376198551586834c7ba3bf1f47 (patch) | |
| tree | cff35d41d2cffc1c5cb8dc0328215aa97f7347f1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a9d692c600cdecae4afbe7abe203df218a8a1f4 (diff) | |
| parent | b1ab8be7d633f84e9e3a1c86b2b2d9a3599077b2 (diff) | |
[automerger skipped] Merge "Allow Background Location Access for Shell" am: 6e1b51a9d9 am: ca5aa7dfec -s ours am: b1ab8be7d6 -s ours
am skip reason: Change-Id Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3 with SHA-1 89796d4936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344377
Change-Id: Ifc10274cacb8df95f77bfba5618668cfdbc8593f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions