summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2020-06-24 19:29:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 19:29:38 +0000
commit8ca4d1b4aabbefac0c992e55e9c1a53ed5db4a88 (patch)
tree71d7986862cdbc5e7a8a846371c55f59e03966c3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent73eb0939db0a615aa3dcd45688010c39f93cc25f (diff)
parentb6e418ad86d3313a1e981c7b753b9b747dd2b50f (diff)
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 0f38e0100d -s ours am: e443c081fa -s ours am: b6e418ad86 -s ours
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 c1a52b82c9 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582 Change-Id: I0d78e520bcb1854cd3cd0df8073fe03d600d4f26
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions