diff options
author | Bill Yi <byi@google.com> | 2019-07-12 14:37:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-12 14:37:18 -0700 |
commit | 0df74430545c6b8ab15c7fa0e49478a97bfe445b (patch) | |
tree | 08570181018eec99b5992a3c0cd9b993ea30087a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | eb840269c78080fe6c2125e884e42f0e3ac6fd7c (diff) | |
parent | 1feb0dfde833e5f9247135579e816b579c1b32f2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 1feb0dfde8 -s ours
am skip reason: subject contains skip directive
Change-Id: I61c45de16e2a398629d1580a4035bc82fc9904f2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions