diff options
| author | Valentin Iftime <valiiftime@google.com> | 2019-10-08 20:54:20 +0200 |
|---|---|---|
| committer | Valentin Iftime <valiiftime@google.com> | 2019-10-08 22:21:44 +0200 |
| commit | 67d9805fedabd8e997ab402602aabb2a82935b94 (patch) | |
| tree | 3bac98b7fc551caa2532dd3964cdca3f0ee78921 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | cde53a44c0a697e86a78d77383822c5d7667bf52 (diff) | |
| parent | 484e166df3c21712c7dfa687d10c91bb0e007397 (diff) | |
resolve merge conflicts of 484e166df3c21712c7dfa687d10c91bb0e007397 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia9db1400207d9196012362c480ede059e94184af
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions