diff options
| author | Louis Chang <louischang@google.com> | 2021-01-18 15:25:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-18 15:25:18 +0000 |
| commit | ec5b2c95cd0f9181e75f223e5bb9b6af3c35aed3 (patch) | |
| tree | 92716e2d122a56f6a86519c45747dead7bafb698 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | eba787f7a53f9cf8014376a74744d8fc88432cb8 (diff) | |
| parent | 5896e8c4fdbe45a0fe3df89fa78c18e5a5c64d29 (diff) | |
Merge "Revert "Integrate IKeystoreAuthorization aidl's addAuthToken wit..."" am: 5896e8c4fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553467
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7a955cbd5d7af92cc83b976728fd993067fe5577
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions