| commit | 4a22d06d85c41b14276d164b779dd5906eee7b0f | [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 | 8a71b00755b54472ac3b3fc98198dde69e703f7a | |
| parent | 7ead06e1867dae0fda4fb0369378eb2a10a96123 [diff] | |
| parent | e5421446a70f1a892a4258d36abf35aca2658e82 [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: 80e17b0086 am: e5421446a7 am: 69c741ec42 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I20c4d8392dba72b142cd9cdf15bed94d52848b81