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