diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-02 15:59:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-02 15:59:03 +0000 |
| commit | 34becf176011d7e4a9f3f85dac82c5fc1781aaa6 (patch) | |
| tree | 4441e9bd326f13544bbcd2a129c334c70fe74194 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 88736d70bd5f345d59f90a814c67177070da6c62 (diff) | |
| parent | c3c1cd54e4ee2aab24a5cbf1cb95b5983a9152dd (diff) | |
Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb am: 36adf13e62 am: c3c1cd54e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf00137fbdfc3dacd99537f9f4e2da0ffbc9a844
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions