diff options
author | Bill Yi <byi@google.com> | 2019-10-05 23:30:09 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-10-05 23:30:09 -0700 |
commit | cadc782272c121777479686478c77323d559fbb0 (patch) | |
tree | 636a74d05977020efb238e163c7f026975e372b5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 9a777f342f863d1fa2110269d87d7be4a07afb97 (diff) | |
parent | c954634c873daf7998e1fd7065155782aeaf3761 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: e258cc65f6 -s ours
am: c954634c87 -s ours
am skip reason: subject contains skip directive
Change-Id: I0418856fe90f92c8bb87dbe625b684679cf0a264
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions