[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours am: 2b0960c2d1 -s ours

Browse Source

am: 77d2f1f8ab  -s ours

Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1

...

This commit is contained in:

Aurimas Liutikas

2018-08-29 12:30:55 -07:00

committed by android-build-merger

parent 68d39ba1ee 77d2f1f8ab

commit 3b4ca98216

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