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