diff options
| author | Hasini Gunasinghe <hasinitg@google.com> | 2021-03-12 18:42:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 18:42:35 +0000 |
| commit | e4db265623cafea0efe7ffb09c47a0c27891ddda (patch) | |
| tree | a9afc6e04e2f54bb86b921f3d9802a4ccafa563a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7eacf4f2c3ab42bf0984b00468d1d3608e7f36e4 (diff) | |
| parent | 216234ab45b68f26587779376d999c4662a52009 (diff) | |
Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL." am: 11e324829e am: 181ffb4bec am: 216234ab45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1630059
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd0c0c34bf9ab1f3df6a8cab5fb111893678e0cc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions