diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-08 15:22:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-08 15:22:52 +0000 |
| commit | b956f8b6f08f973a42b111c403319d87871f8df3 (patch) | |
| tree | c731f9c792493aea15e7e5b8159e5c487c0b892c /rs/java/android/renderscript/RenderScript.java | |
| parent | 8ad13e49a086a05c8b8f3d91ca7e31f766b2db44 (diff) | |
| parent | 11cb680764ab0f78ae5c42d226d548795ee8614e (diff) | |
Merge "Keystore 2.0: Silence common error on operation abort." am: 492ab3dd2c am: 11cb680764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I748c8b9f0b830d66c226478da714ce6e77f0752f
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions