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