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