summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLes Lee <lesl@google.com>2021-01-08 10:10:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-01-08 10:10:29 +0000
commit026441fcd50f56a0e67d983821f17f5d2b241bb3 (patch)
tree79d3be7be671eb8214c9d7206d4e285b5640cc2c /tools/aapt2/java/JavaClassGenerator.cpp
parenta8faba9e7ca493ad04884bb7d75937924c9031f7 (diff)
parent2f8f97c64cdbe797c06eda48cf561fe0e62b39e3 (diff)
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 6ae2535ec6 am: 2f8f97c64c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4f4e7bfc059df3415378179b3d70ca35b8ebf4f1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions