| commit | e5421446a70f1a892a4258d36abf35aca2658e82 | [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 | b8131e5c7a8d8bc126ab000860c93daecbb13563 | |
| parent | f21c73b7ad96b22cbbd7c946f962b8d96cc34cc6 [diff] | |
| parent | 80e17b008654fac610bc4268c82f39b71042339a [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: 80e17b0086 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I7b904af6c34190f53378cc1acc518840b527d434