| commit | 77d2f1f8abf2ec095c6d79877de1786798117ec5 | [log] [tgz] |
|---|---|---|
| author | Aurimas Liutikas <aurimas@google.com> | Wed Aug 29 12:14:32 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 29 12:14:32 2018 -0700 |
| tree | 64576b30322ed7fb39524da47261711e986df783 | |
| parent | 77e838e4514a0fb6cb88df4fb8852833d1aa2dd5 [diff] | |
| parent | 2b0960c2d1a6899f7e4f1f0ec5ce0c1221d69400 [diff] |
[automerger skipped] Merge "Migrate Settings to androidx." am: a544f17b99 -s ours am: 2b0960c2d1 -s ours Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a