diff options
| author | Bill Yi <byi@google.com> | 2019-05-22 18:19:51 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-22 18:19:51 -0700 |
| commit | 60c822a589d9f3cb7f3777396f3d62ebe56f887f (patch) | |
| tree | f5a2e71648b51d114e4b914a975f0b71ad1f1256 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dca1536b44f54c409fdd8b364b266af0b6bca6c4 (diff) | |
| parent | 63f9868a520ba15bb7a58be2d70ddf7780a4a94d (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: da5f0466b9 -s ours am: 12954bad1b -s ours
am: 63f9868a52 -s ours
am skip reason: subject contains skip directive
Change-Id: I0a33069be803f87752d4c9574a172460ae3d42aa
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions