commit | 3b4ca9821607b0f08c4eaf9a04b6c7c2235710ad | [log] [tgz] |
---|---|---|
author | Aurimas Liutikas <aurimas@google.com> | Wed Aug 29 12:30:55 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 29 12:30:55 2018 -0700 |
tree | d017416342eb02edd60a50408e59984f60f60780 | |
parent | 68d39ba1eebc979ebb3f09936479f930acb3277e [diff] | |
parent | 77d2f1f8abf2ec095c6d79877de1786798117ec5 [diff] |
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours am: 2b0960c2d1 -s ours am: 77d2f1f8ab -s ours Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1