diff options
| author | 2022-08-25 00:40:29 +0000 | |
|---|---|---|
| committer | 2022-08-25 00:40:29 +0000 | |
| commit | 24d242daf46e9b541f9163db7ed51ba0336fc6ef (patch) | |
| tree | b18c3f888b1a9ffdc1a5751a485c97471fbbb66b /libs/androidfw/ResourceTimer.cpp | |
| parent | 3a73f2d45ad2a61ce152730778f4fdb12c22ea93 (diff) | |
| parent | 3b6dc408dc59e91daf1849b28f3b72bd8000a014 (diff) | |
Merge changes from topic "am-14bf5a3fba3143bdb2d095df4a013d3a" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-dev am: 1ee3c74d2e am: 362c47c6e7 -s ours am: d06f5f0f74 -s ours am: fe73c5d7a4 -s ours am: 4dcde38cca -s ours am: 939c6dafa2 -s ours
[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c012 -s ours am: eee34d1470 -s ours am: 45db391cd7 -s ours am: 9f6770eb6a -s ours am: 63b0977b81 -s ours am: f763751b46 -s ours
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions