[automerger skipped] Merge "Remove unnecessarily @System/TestApi annotations" am: 79c47faf99 am: 2ff58ac90a -s ours am: 5e39e8835a -s ours

Browse Source

am skip reason: Change-Id Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2 with SHA-1 42bec243c0 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1349284

Change-Id: I789df5921efec352568b4037c0d3507333e635d8

...

This commit is contained in:

Makoto Onuki

2020-06-24 23:02:37 +00:00

committed by Automerger Merge Worker

parent a801498e60 5e39e8835a

commit f8b56b9e47

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