diff options
| author | Nathan Harold <nharold@google.com> | 2020-10-07 07:53:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 07:53:22 +0000 |
| commit | a63442f2850a4fa51680d0c693ad5a6dcb1f32e5 (patch) | |
| tree | 683c2db6a8c334ed14821fce18e9e672498ed810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fe94fb392dd87c3086716cf5063248abbc9ad92a (diff) | |
| parent | e4d4916078e8d0da7f75642514b98198d4e028f8 (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: e4d4916078 -s ours
am skip reason: Change-Id I8caa3ea409836ce8469d8d8210b481a0284594f2 with SHA-1 81bab8b849 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12664597
Change-Id: I3092e00e2f64a4b13ff641f6e855883fcd55f35c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions