| commit | 4ff025d8a584710a7c55b05217a35e7ef1935fd9 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Fri Mar 19 10:52:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 10:52:23 2021 +0000 |
| tree | 93654d4eba4d707d79cff29ad337f2626fe0980b | |
| parent | e988cf4321faf1855807f1cd03a87685e7387042 [diff] | |
| parent | dc2fed345461d72fe0fc42efb3fe79b7ce426914 [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: dc2fed3454 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I7b904af6c34190f53378cc1acc518840b527d434