diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 02:51:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 02:51:36 +0000 |
| commit | 579d132d4d7d6b900137bc4479d5af26b9a8b4d3 (patch) | |
| tree | b6af6323b4a09a85cadca2cc61e1ac0c5baf29ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e7c4fb3919c7f319ace08657c6915f2692d8cd2a (diff) | |
| parent | d27fb1090a228f6a5cb4300b1ac90b8b86891cad (diff) | |
[automerger skipped] Merge "Keystore 2.0: No longer install the legacy provider." am: e72a7b4f1b am: 02ee21ec65 am: d27fb1090a -s ours
am skip reason: skip tag Change-Id I0d71d3c9cdd586a508827eb26120c872cb8643ea with SHA-1 d2d4c69a66 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645706
Change-Id: I7a1c3d61d224a86e074b14f33caeb9740b976da2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions