diff options
author | Bill Yi <byi@google.com> | 2019-07-14 17:11:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 17:11:24 -0700 |
commit | 36bf7af7428aba17071ba756bdee92b2e3ca8da7 (patch) | |
tree | d322840c50acd665ed0328b68e2c076ccbcc9094 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 528a52e440a62785e4aa8c72e6fbdffb2eeb454b (diff) | |
parent | ed54d0bf9d4ede3e3069ed7838f22c2fc236692d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8797e309dd -s ours
am: ed54d0bf9d -s ours
am skip reason: subject contains skip directive
Change-Id: Ib31227889dcfc135ff39c2cfce58b6bd28434fda
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions