tree 5563667ac3d7f33c83b59931d5894d2d097319ca
parent 0e05005d8ddbec050064ffd507daf45bca995147
parent b1af85d15523db44d4fa80c78409069ec691ed0a
author Colin Cross <ccross@android.com> 1535492568 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1535492568 +0000

Merge "Migrate Settings to androidx." into stage-aosp-master