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

Browse Source

am: 2b0960c2d1  -s ours

Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a

...

This commit is contained in:

Aurimas Liutikas

2018-08-29 12:14:32 -07:00

committed by android-build-merger

parent 77e838e451 2b0960c2d1

commit 77d2f1f8ab

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