diff options
author | Xin Li <delphij@google.com> | 2019-11-25 07:51:27 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 07:51:27 -0800 |
commit | 9002055cfef9a81606909c8761cbebf73883615c (patch) | |
tree | dba79ce1910597a58d098d78f957fc2d02447764 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c4ca0d0cd9c986f883d2e60f214b45f7fbb80839 (diff) | |
parent | 698f511333e895862c51bf8030b1669b788495a4 (diff) |
[automerger skipped] DO NOT MERGE - Merge QQ1A.191205.011 into stage-aosp-master am: 9ae3822f83 -s ours
am: 698f511333 -s ours
am skip reason: subject contains skip directive
Change-Id: I829be917d0a3e77ad50c2c548b72da0229dc0c73
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions