| commit | 33bed027385086530a903221848071714eb0afdc | [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 | 3c4e0872f4492558a21a08ca3643e542b6a6ad80 | |
| parent | beea63a64f90cf4763c3a6d3dd16ba745ddcb59f [diff] | |
| parent | e07e3856da456b4e5d9ad086284578a5ca0dfe17 [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: e07e3856da Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I7b904af6c34190f53378cc1acc518840b527d434