diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-22 12:33:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 12:33:19 +0000 |
commit | 8ed5c55633211716c46c15331537a3ed82c0910f (patch) | |
tree | d461e661cf790907210a66f994926530852385a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0f71cd372fce0650ddeaa000cc1444329264591a (diff) | |
parent | c000e910479acb12a0494b910420e5d7d35dff4c (diff) |
[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b3961 -s ours am: 64169ae2a1 am: c000e91047
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144
Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions