diff options
| author | 2022-02-22 05:01:51 +0000 | |
|---|---|---|
| committer | 2022-02-22 05:01:51 +0000 | |
| commit | 5137e2ddd730731ebea784058e0b5f9dda838d29 (patch) | |
| tree | c04724afd57a6861b433c1b5c1e8f86f28f0998c /tools/aapt2/ResourceParser.cpp | |
| parent | ab490a89974b3bc7458773d09614b1cccf177542 (diff) | |
| parent | dd111c15df023aa66fd2413d11e67f5fa553879b (diff) | |
[automerger skipped] Merge "New @TestApi: DevicePolicyManager.isNewUserDisclaimerAcknowledged()" into sc-v2-dev am: 7ac3a06942 am: 02272fd207 -s ours am: dd111c15df -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: Idbda8e8f01b0666b93be9e05f0f85a6bed0220db
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions