[automerger skipped] Merge "Remove FastNative annotations on synchronized methods." am: e6db6b21e6 am: 09f483415d -s ours

Browse Source

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

...

This commit is contained in:

Nicolas Geoffray

2020-12-14 14:40:27 +00:00

committed by Automerger Merge Worker

parent 7c7b231319 09f483415d

commit 55e3b2fb6f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available