tree 5563667ac3d7f33c83b59931d5894d2d097319ca
parent e89bf878c669960baf3bd8072c9beda3e120c48e
parent a544f17b9923a015e23ff70bbbe0fac18f30bddf
author Aurimas Liutikas <aurimas@google.com> 1535569224 -0700
committer android-build-merger <android-build-merger@google.com> 1535569224 -0700

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

Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861