diff options
| author | Tianjie Xu <xunchang@google.com> | 2021-02-11 22:57:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-11 22:57:36 +0000 |
| commit | bc71ae14893ee2452b0508cf3cb4ccebeff705f0 (patch) | |
| tree | 12fdf34041a583345ccf7d4db57919e221d7eead /rs/java/android/renderscript/ProgramRaster.java | |
| parent | 9112917eb834cd35cd90790d9a68084aba950cd2 (diff) | |
| parent | cd9d960d236b5008aad4c20a9946190eb89fa4fb (diff) | |
Merge "Delay loadEscrowData from locksettings" am: 60edeec07e am: cd9d960d23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566555
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6ea608a47dc07a2cd96b5c6d1e9dfd4c42f366df
Diffstat (limited to 'rs/java/android/renderscript/ProgramRaster.java')
0 files changed, 0 insertions, 0 deletions