| commit | 4f7e05ccaea4bf30afed2371d21e24ef4ced5b24 | [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 | 922f459f46d9b7407ecfcb2410194ce9cb104f5a | |
| parent | ee8ed2380893898c62ecd6fe059a5d7d4c87992f [diff] | |
| parent | be8093b1255a946876df501cb7734b336f4bae99 [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454 am: 4ff025d8a5 am: be8093b125 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I20c4d8392dba72b142cd9cdf15bed94d52848b81