[automerger skipped] Fix SntpClient 2036 issue (1/2) am: f663ab4276 am: 87fe4ba614 am: 741fb2db90 am: 970c036774 am: 4b11242f50 -s ours

Browse Source

am skip reason: Merged-In Ifdaada39298b05c48a3207fe6c0fad71c8a0a252 with SHA-1 e811aa358d is already in history

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

Change-Id: I5632bbe0c9074961d2b6392c8d6d7ea09f6393f0

...

This commit is contained in:

Neil Fuller

2021-10-19 20:28:27 +00:00

committed by Automerger Merge Worker

parent f568c192e2 4b11242f50

commit d188ff28d3

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