diff options
author | Bill Yi <byi@google.com> | 2019-09-25 16:00:54 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 16:00:54 -0700 |
commit | b2497c1d9c54e2634cbe653812239870a76ea9e0 (patch) | |
tree | a8e0c84c716c0ebad45aaf6e51a28cf285457b49 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e753d3c959b13982f10f59b49358faa1fa66492e (diff) | |
parent | 57ac1832570d08766590e9bc5063a422a51d061b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 15995daccf -s ours
am: 57ac183257 -s ours
am skip reason: subject contains skip directive
Change-Id: I6736fe6855da88c230137879739b39955c237065
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions