diff options
| author | Yimin Li <ymli@google.com> | 2021-03-28 05:56:16 +0000 |
|---|---|---|
| committer | Yimin Li <ymli@google.com> | 2021-03-28 05:57:44 +0000 |
| commit | 401346a961dca6193d988b00d52ba91cc2326cca (patch) | |
| tree | 75eef238fc156e86003c83536fc3ec466eb91897 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6017f31dad156fa356b44cbf8aa0e4546baeb663 (diff) | |
| parent | 14a5a57a1a1bc232a221e6248bee16eae81f5d44 (diff) | |
resolve merge conflicts of 14a5a57a1a1bc232a221e6248bee16eae81f5d44 to rvc-platform-merge
Change-Id: Iae38d01fbb343c6ea96e223c78abeb34e58446fb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions