diff options
| author | Beverly Tai <beverlyt@google.com> | 2021-08-24 21:17:12 +0000 |
|---|---|---|
| committer | Beverly Tai <beverlyt@google.com> | 2021-08-25 13:08:31 +0000 |
| commit | e06f6bcf5e5b3be03128a1ff9110872e375d7619 (patch) | |
| tree | c459587b85c6cb843969f0b7909cd0158101d642 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c5c595c86a75f39ecc6eefd22aaa302e7454a143 (diff) | |
| parent | b0a08742901a97e73d67ade11fb0ebb22cf457ec (diff) | |
resolve merge conflicts of b0a08742901a97e73d67ade11fb0ebb22cf457ec to sc-v2-dev
Bug: 197160246
Fixes: 197668798
Change-Id: I6a0ce5d9880ce2f825cefe35aa110422bfc36ace
Merged-In: Id3aa20662df8cdd6676141f5f70e5eae0cec6215
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions