diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-02-14 19:10:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-14 19:10:06 +0000 |
| commit | 5b94267c375877ee7e085231d46995b3f313d671 (patch) | |
| tree | 0b84079a452bb4b5fcdc9269268ef9980a858fe9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4fb93dabd7a62c1722356c0a3a1fb32d8903258b (diff) | |
| parent | 275601c1269eb050b325ac89abc7b83354f250c2 (diff) | |
[automerger skipped] Merge "Add KeyChainService credential management app APIs" am: e02debebcf am: e5ba22ab36 am: 275601c126 -s ours
am skip reason: Change-Id I00b7df27a92f6ee4f74546f892c83290fead1112 with SHA-1 e17727ebe4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icd1ba99bd80f07fbee1adf46fa25a42f29277841
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions