diff options
| author | 2022-02-22 05:24:12 +0000 | |
|---|---|---|
| committer | 2022-02-22 05:24:12 +0000 | |
| commit | 473fa6c54d85e43f9bccd693f414a97e2c49968b (patch) | |
| tree | 8775f7fdb7cd7c08288819972b23458adcbe82f3 /tools/aapt2/ResourceParser.cpp | |
| parent | 8864bb493e090ce7e9cebed702f7c2aefb4fc84a (diff) | |
| parent | 5137e2ddd730731ebea784058e0b5f9dda838d29 (diff) | |
[automerger skipped] Merge "New @TestApi: DevicePolicyManager.isNewUserDisclaimerAcknowledged()" into sc-v2-dev am: 7ac3a06942 am: 02272fd207 -s ours am: dd111c15df -s ours am: 5137e2ddd7 -s ours
am skip reason: Merged-In I8b98a1af60db65c1b27f19cf3e93b21d33d88278 with SHA-1 9a6b808da3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16924150
Change-Id: I48fba5f2879c648985a4cf3caad6ab08574cac6c
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions