| commit | 69c741ec42ff271271ecd19c8b57eb50393b5f1c | [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 | 5b6824b242638201005f49400bab1acb6cf7753f | |
| parent | 00a76b180b60dcffef2dd530ce2fb5675785bbd1 [diff] | |
| parent | 33bed027385086530a903221848071714eb0afdc [diff] |
Merge "[NS03] Mix in other CS-managed properties" am: e07e3856da am: 33bed02738 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101 Change-Id: I6c325a102c93459a377e0a8670176f0989f88738