| commit | edc2a4bcb5726dcb209561b0002d42ff91cbedef | [log] [tgz] |
|---|---|---|
| author | KOUSHIK PANUGANTI <kpanuganti@google.com> | Wed Aug 29 12:27:55 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 29 12:27:55 2018 -0700 |
| tree | 35d88eb2b76a2b27a4a49db2a01e6e3666da51b0 | |
| parent | 9c729ed806f94fbaacdae7a4652a4e084bf35781 [diff] | |
| parent | 856a24625b37249fac685ac342f7ac4b902326af [diff] |
[automerger skipped] Merge changes from topic "androidx-settings-aosp" am: cdf75c3cc8 -s ours am: 856a24625b -s ours Change-Id: I568173f55030795114f8ccc4f4d47b4028a0f15e