summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2020-09-21 08:58:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-21 08:58:33 +0000
commit9efefa8935200017f761e27660fe2afae226f2c2 (patch)
treee0d0f33b7e6dfb8107c4eaca3e2153d5ebb7afae /tools/aapt2/java/JavaClassGenerator.cpp
parentdfe1e827c9f66bfc5f8ab84d560180a5e1c1abe7 (diff)
parentf593fe9b17e67e84d12c23411f215d8f25e55b22 (diff)
[automerger skipped] Merge "Data connection for carrier specific APN" am: 47a1e949c3 am: ba9b991631 am: eb10ff679b -s ours am: 3ede3f3039 -s ours am: f593fe9b17 -s ours
am skip reason: Change-Id If1e6d2bf58de39c22caa901fcd90fb11f104d900 with SHA-1 115e02818a is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1238996 Change-Id: I8511216ac017f697894d92c9d8c7a8927f5bdee9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions