[automerger skipped] Merge "Migrate away from deprecated Truth APIs." am: c5a500bf07 am: 1b69ab26e9 am: 94fa8e0921 am: 01236ed32f -s ours am: 0488650aa0 -s ours

Browse Source

am skip reason: Change-Id I76f9c37cb699ce6ab8715ffe35d11668ccbceea1 with SHA-1 46e85a2fad is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1449661

Change-Id: I8c5e459eadfefe9deaceba3f3af9357d1dcbfe33

...

This commit is contained in:

Alexander Dorokhine

2020-10-06 12:36:07 +00:00

committed by Automerger Merge Worker

parent f46426dbe5 0488650aa0

commit 7d952e6ad1

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