diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-02-14 18:38:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-14 18:38:40 +0000 |
| commit | 275601c1269eb050b325ac89abc7b83354f250c2 (patch) | |
| tree | c061e30b6cbb3a6532c4047fc171f7f7d4d8143a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7056d6af26c8bc5a55bde59e39346e4f293c46b5 (diff) | |
| parent | e5ba22ab36482eafa21e4efc3cb4b5dc94d419cd (diff) | |
Merge "Add KeyChainService credential management app APIs" am: e02debebcf am: e5ba22ab36
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549395
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I40a70a22f5d652e24d3fb31569e639e9313927b1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions