diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-19 02:52:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-19 02:52:10 +0000 |
| commit | bd38846660983b337bb2e45d42d8508731702c4b (patch) | |
| tree | b6af6323b4a09a85cadca2cc61e1ac0c5baf29ad /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 579d132d4d7d6b900137bc4479d5af26b9a8b4d3 (diff) | |
| parent | 6f06dae1c36320a48834b243ce6b2bcebf0943ab (diff) | |
[automerger skipped] Merge "Keystore 2.0: Fix diagnosing invalid key in CipherSpiBase." am: be1b1d5550 am: 1ade004e0f am: 6f06dae1c3 -s ours
am skip reason: skip tag Change-Id Idc9c7dc2614a47818227a06fe76078f72c0c1f57 with SHA-1 a1963a9b64 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646146
Change-Id: I8333348d82801b0a2b040f3f38cfa4ae6287c873
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions