diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-20 18:48:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-20 18:48:40 +0000 |
| commit | 7108d008dbf77e5067b38a18470a7e96b0920fba (patch) | |
| tree | 5bb7d7b0d56aebc5635f22d6cb373b422e22229f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a77d5f7157d4a0bd967cfed9f1db96f74acbbac7 (diff) | |
| parent | 5e27a324ac9c96007f171b659a0b2215af2734b0 (diff) | |
Merge "Keystore 2.0 SPI: Use Timestamp from secure clock service" am: f327ea256c am: 5e27a324ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538990
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ab6943f450302cca4ae5f898146506c51c75eac
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions