diff options
| author | Pavel Grafov <pgrafov@google.com> | 2021-02-25 15:51:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-25 15:51:50 +0000 |
| commit | 7e74123b72b6953e3bddfb23e0aea0bca5e3ad18 (patch) | |
| tree | 2dc84480e0966d9c9eb699a70e1a6594fe595e34 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 057450645c9098f67b8f636cee3f13930fe93453 (diff) | |
| parent | 4da629d9be8ac32ee095f258e69c996e1eef1e01 (diff) | |
Merge "Keystore 2.0: Add keystore engine grant string convenience functions." am: 4da629d9be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibe70ce5d83ea20a85af2817d8e491e932d9c49f1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions