diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-03-22 12:02:50 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2019-03-22 12:02:50 +0900 |
| commit | 404a5266728aa09d70f2b1badfc8df9466756c1e (patch) | |
| tree | e39918fd9d88632e2916828fded364e0526f7698 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 75eaf771f8adff4be40e62ea891b728d05d98882 (diff) | |
| parent | 0569184dc0336873ecae5d7ae6210393f9e27282 (diff) | |
resolve merge conflicts of 0569184dc0336873ecae5d7ae6210393f9e27282 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I3af8ee8a7d8a4ff9dca0195b1947679cc09b2e89
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions