commit | 7d9f19655b98e8d332b82855691cbee5af771a20 | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Tue Aug 28 15:17:41 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 28 15:17:41 2018 -0700 |
tree | 3cd23154182e136044010afdd815d8304048ff03 | |
parent | df1eefeb6e878917034367f998a36e947c44bf87 [diff] | |
parent | 90184808c13b35f7a449f9a0013f2e62f59d1701 [diff] |
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master am: 048f11d0a9 -s ours am: 90184808c1 -s ours Change-Id: I9adcfe2dfdc6613024c7bba754bd2543e392c556