diff options
author | Rubin Xu <rubinxu@google.com> | 2021-02-17 23:51:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-17 23:51:12 +0000 |
commit | 7e3ab7815ac19b0dbf586bc274b362b7e0878a6e (patch) | |
tree | b9f4c0a9679792a13314ec0659ecc53bbd47fb03 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 559fd17ee92bcd0679764190b53b2b795555d6de (diff) | |
parent | 5bddee5dda26bcf6b9cb1a71c3d23627800ad19b (diff) |
Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c716 am: 5bddee5dda
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571063
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions