diff options
| author | Nathan Harold <nharold@google.com> | 2020-10-07 07:47:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 07:47:34 +0000 |
| commit | 3b923b728f4b9c6cc657fa530fd65844b33cbffd (patch) | |
| tree | 683c2db6a8c334ed14821fce18e9e672498ed810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 34fd4ca30f6c106eedc681ff208453860bffcb81 (diff) | |
| parent | 7510b0134054570311ea9e4db056231fb0bedfc0 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE][BACKPORT]Improve location checks in TelephonyRegistry" into qt-dev am: 0b5b9eed4b am: e45ec287ed -s ours am: 94e5401f7e -s ours am: 96631660af -s ours am: 7510b01340 -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 cc584e777d is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: Ia86139d6cc2161311470236022fe5f9c98fafc8e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions