diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-12-14 14:40:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:40:27 +0000 |
| commit | 55e3b2fb6f930bdf62270598b15de87f11ae544c (patch) | |
| tree | 6bb2ebb70dd7429f3b5759d57674a35750439479 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c7b231319ef17b7c4948626af4525fbb3a748ed (diff) | |
| parent | 09f483415d330e925e8ea6b264bef5f2abff0a39 (diff) | |
[automerger skipped] Merge "Remove FastNative annotations on synchronized methods." am: e6db6b21e6 am: 09f483415d -s ours
am skip reason: Change-Id I1e34c78a8438c67e5a1bedb83eb977389ee9a82d with SHA-1 498aa12949 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519499
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01c7c6521dccee40954f0e6399051086f4f76018
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions