diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:20:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:20:45 -0700 |
commit | c3dd708c8c490dd7100c0deba69db0b9f33c4eb1 (patch) | |
tree | c8e287e790ee4fae08838d85841efc27321250f7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d923b79a221b43bbe168aeaeb37fdd76c44d18fb (diff) | |
parent | c75cf1f0c7131b797a7a8acabd07d53dc556d05d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 890bcfa7ac -s ours am: 132a22ecec -s ours
am: c75cf1f0c7 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie33d521914a2181598c2af34443f5b84a477f81a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions