diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 18:32:43 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 18:32:43 -0700 |
| commit | f45d7975891c8363904ddc2cdbace086ae763a44 (patch) | |
| tree | f5a2e71648b51d114e4b914a975f0b71ad1f1256 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 633a9e87a42522eebfc63faba710ac1bab653e6b (diff) | |
| parent | 71c25b3ef5e9547f4889c6efddc597cdd59ecae4 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8c9c8a6939 -s ours am: 0dd46f1e35 -s ours
am: 71c25b3ef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I6e6b5af14e92858cdb4d37bc4014369d96127ca8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions