diff options
| author | Santos Cordon <santoscordon@google.com> | 2019-08-22 18:01:13 +0100 |
|---|---|---|
| committer | Santos Cordon <santoscordon@google.com> | 2019-08-22 22:23:16 +0100 |
| commit | bb6f8329a0a242908dc0b65b031aecc415e5c32a (patch) | |
| tree | 5122ed590463ba64c177e0922a524fb196464839 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 90b0395647bce7fab82289b65ffdf9b251224c40 (diff) | |
| parent | bd592e043991a525dd6ecf95acd8f50052bb22e2 (diff) | |
resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9819adf76d6c96c54a02670a1d601a329003eb12
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions