diff options
| author | 2022-09-16 01:00:36 +0000 | |
|---|---|---|
| committer | 2022-09-16 01:00:36 +0000 | |
| commit | fdc531f02897289593a0eb9908d291a3c6496e24 (patch) | |
| tree | b2aa7b4bcbb9b2ce336fbe8a590b7369200fef76 /libs/androidfw/LocaleDataTables.cpp | |
| parent | 4b0ce7cb3bb3de246e6961497da37c40ee10045c (diff) | |
| parent | 5d9e4c2157989158431e0f23e4098d9ede39e88f (diff) | |
Merge changes from topic "am-5686a9d2b91a4272a3fb4bc24863b71b" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-qpr1-dev am: 04d4edbc35 -s ours am: 798d7a57ac -s ours am: 33a35ca1be -s ours am: 9df43d1119 -s ours
[automerger skipped] [pm] forbid deletion of protected packages am: 2d6eae165b -s ours am: f88c130108 -s ours am: a382ceb5b5 -s ours am: 511f69c187 -s ours
Diffstat (limited to 'libs/androidfw/LocaleDataTables.cpp')
0 files changed, 0 insertions, 0 deletions