diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-19 15:09:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 15:09:19 +0000 |
| commit | 2737162d9eafbe3aebcb637a19d03ee037e70d47 (patch) | |
| tree | cc845c62533e992203f2505cc4d273a4ea7c5696 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a261dfbca38e77dc5aa8b6814a32679a67c61f8 (diff) | |
| parent | 58710e9a15fa2d6a67e0e0fc8b18d779edb5f5cd (diff) | |
[automerger skipped] Merge "Keystore 2.0: Enable by default." into rvc-qpr-dev-plus-aosp am: 58710e9a15 -s ours
am skip reason: skip tag Change-Id I13a3db8ca736cceb06e864457046ff9ca641322d with SHA-1 7aa8d2aae2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13913584
Change-Id: Ie2e51a6f5821bf72d482845d040c9d5a678b2b56
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions