diff options
author | Sarah Chin <sarahchin@google.com> | 2021-04-20 00:34:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-20 00:34:05 +0000 |
commit | 7f0ece6bcf47eb9af865b4dd3704800a2728bb51 (patch) | |
tree | de1eb161fa78e048e881e444741902b348515ee5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a063e0f24a716d808c582113c3f828eb69b9e0a2 (diff) | |
parent | 740a91854e83390af714fea4038055b602fbf542 (diff) |
[automerger skipped] Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efba5 am: 3c6d7d7dc6 -s ours am: 740a91854e -s ours
am skip reason: skip tag Change-Id Icb4e2c619dacaea9e74cedea31865ec1eb689dce with SHA-1 172f15e5e1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663446
Change-Id: I7a39f99af7de618e0d529e7a84c39c96e2489282
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions