commit | 801de92f8dd96294fb3a2be7fc75a1bde0c27920 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Mar 19 17:23:01 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 19 17:23:01 2021 +0000 |
tree | 83c62ed4a4ff80ac96abd013902797c4c248ae47 | |
parent | 6cb33ba5a7b387fa39daf927ad341c72fb61f3cb [diff] | |
parent | 73cdd8195a3eb81974303cd2d1164e76d42235d4 [diff] |
Merge "[NS03] Mix in other CS-managed properties" into sc-dev am: 73cdd8195a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921824 Change-Id: I43967b8f8fabcd77b9b8ad5ee442b0e1ab9bee9b