diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-04-19 21:06:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-19 21:06:39 +0000 |
| commit | 740a91854e83390af714fea4038055b602fbf542 (patch) | |
| tree | 74c515de36e03258306b11fe761fd80a7a6ec986 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3d7210ee88f540971bb892fee331e1d731a8e19f (diff) | |
| parent | 3c6d7d7dc6cade8b2808d2b909ea1fbdfce5dc01 (diff) | |
[automerger skipped] Merge "Update carrier privilege check in enforceSubscriptionPlanAccess" am: 958f9efba5 am: 3c6d7d7dc6 -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: I7e0989454ef514ca787bfe4e1ce8908bc5e6a92f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions