diff options
author | Bill Yi <byi@google.com> | 2019-07-25 15:13:57 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-07-25 15:13:57 -0700 |
commit | 77125c9d5f591e9adb6910a5c9aa2a750ead595b (patch) | |
tree | 00aea77a897ab17c801f7e9d8c100af0a1abbe92 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f8d5f5af86e939fe2bb74dbb5a53527b67e02901 (diff) | |
parent | 6abd096063b9525cf07f7867e980d73bc0c02e5c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b863192338 -s ours am: 258eba10e3 -s ours
am: 6abd096063 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic7eb5e72c339975f62305f69664a63740ab9d477
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions