summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-05-08 08:43:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-08 08:43:53 +0000
commitdea3eb3caaf9f4e081c3af20e639fe2904729ea2 (patch)
treedb862b9215af51ddc15a4dd15ce4aa14e8cdac24 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent047d7fc5f488aaecbb63e630ba96b14e31d21786 (diff)
parent874cf586904b766c7aa78e7c01b4c96324eb9956 (diff)
[automerger skipped] Merge "Revert "Move libstatssocket to shared."" am: 0488dfbce1 -s ours am: 874cf58690 -s ours
am skip reason: Change-Id Ibfa25c0fe7874ba08157a5ec43601c5cf8305723 with SHA-1 21f7e6a3f6 is in history Change-Id: I065fc650741fa6b1c9b35a9a0b24f1bd87d44b10
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions