| commit | 7c614b2e105a4f224da9aaf27596d8fa7a1b8ffd | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Mar 19 11:32:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 11:32:34 2021 +0000 |
| tree | fcf48b77fd11585e16120e95d925a5bfd7e0aea7 | |
| parent | 46f43768928627ba054974665bb746252d0112be [diff] | |
| parent | 69c741ec42ff271271ecd19c8b57eb50393b5f1c [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: e07e3856da am: 33bed02738 am: 69c741ec42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I20c4d8392dba72b142cd9cdf15bed94d52848b81