diff options
author | Bill Yi <byi@google.com> | 2019-07-14 18:14:24 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-14 18:14:24 -0700 |
commit | a103ad19e1764d08440cf09c99837b588cf2d8e0 (patch) | |
tree | d322840c50acd665ed0328b68e2c076ccbcc9094 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 36bf7af7428aba17071ba756bdee92b2e3ca8da7 (diff) | |
parent | 2e5d35145d577cc94603f36df7048b8d25365b6b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a76086102b -s ours am: 02d6f14ad0 -s ours
am: 2e5d35145d -s ours
am skip reason: subject contains skip directive
Change-Id: I0ec1baa7aaed82b2e60f6c91eb925363d070ac78
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions