summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorJunyu Lai <junyulai@google.com>2021-01-08 14:52:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-08 14:52:54 +0000
commit09460f1ccd0a101038bf7e4fc8c2fad5f0642077 (patch)
treecd89d697328c77fa7d2fd777d3da7cb06ff76709 /tools/aapt2/java/JavaClassGenerator.cpp
parent639e6eb5cfd041e652ba9284076efd56bf64118c (diff)
parent7b15416a2cb935049966f88b5472a6ffe7df1eff (diff)
Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7b15416a2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66fba706c6a8f78344026eac490ad266f838c21f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions