[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master

Browse Source

am: 048f11d0a9  -s ours

Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70

...

This commit is contained in:

Colin Cross

2018-08-28 15:03:29 -07:00

committed by android-build-merger

parent 44593b7bac 048f11d0a9

commit 90184808c1

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