diff options
author | Bill Yi <byi@google.com> | 2019-09-01 08:46:30 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-01 08:46:30 -0700 |
commit | 166e30c71ed5247be515c019e8886e817c6c9365 (patch) | |
tree | d6b7d6db4527efb4e59a9548a8f6d0035b9d072b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7631a712c1565db7ce5421e95d9c3094a2f7b2ac (diff) | |
parent | 706c57f051a1596d4ac0d0ffeb4309b56ab6a671 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ed54ec22f2 -s ours
am: 706c57f051 -s ours
am skip reason: subject contains skip directive
Change-Id: Id0b8b39b8c6d3fa5024ceec076f50244efb28430
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions