diff options
author | Luke Huang <huangluke@google.com> | 2020-06-24 19:12:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 19:12:16 +0000 |
commit | e443c081faab5bbe5a9b58d1217722a6302a2302 (patch) | |
tree | faa941aedbeb206502abc8949a6888bae982eb0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 05a1431deb26c6e2e500cccbea7c331c3cf762cb (diff) | |
parent | 0f38e0100df79052055a004533ae76376efe242c (diff) |
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 0f38e0100d -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: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions