diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-12-14 14:57:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-14 14:57:51 +0000 |
| commit | 2e0fd39de137a1487acaea1831f0393181fc05ce (patch) | |
| tree | 519a4063533311a0002bf978fdbce47ac018aa57 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bac270a9d00ae15420bfa80e26de308cba4651e3 (diff) | |
| parent | 55e3b2fb6f930bdf62270598b15de87f11ae544c (diff) | |
[automerger skipped] Merge "Remove FastNative annotations on synchronized methods." am: e6db6b21e6 am: 09f483415d -s ours am: 55e3b2fb6f -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: Ia5e610790fe2267558425691cd680739c87c4818
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions