diff options
author | Bill Yi <byi@google.com> | 2019-07-12 15:01:11 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-12 15:01:11 -0700 |
commit | bcc5cadd0c3a1410128a76753cc6e011c47f71b0 (patch) | |
tree | c2ab710805b1f169f158be1a514a7a3ad79344bd /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | b3e35759ab847860ede5a7c20e99c85358fb4663 (diff) | |
parent | 0df74430545c6b8ab15c7fa0e49478a97bfe445b (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1feb0dfde8 -s ours
am: 0df7443054 -s ours
am skip reason: subject contains skip directive
Change-Id: I145c27b3f368aafdb735333bbcde9ffab79c6c2b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions