diff options
| author | 2022-03-11 05:08:36 +0000 | |
|---|---|---|
| committer | 2022-03-11 05:08:36 +0000 | |
| commit | 8ee22a3455132fc5018d94132249798301555091 (patch) | |
| tree | 6b8cb8c3c151639307af9725b85436dd36830f03 /libs/androidfw/ZipFileRO.cpp | |
| parent | 271944d02b2ca409379aa84db3a3a9cfe71dfbf5 (diff) | |
| parent | 7d8ba19027e8f0d2ab4927c6e90b86830dc67fe7 (diff) | |
Merge changes from topic "da-rearc" into sc-v2-dev-plus-aosp
* changes:
[automerge] DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission 2p: f7b9a4dd28
DO NOT MERGE add android.car.permission.CONTROL_CAR_APP_LAUNCH permission
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions