diff options
| author | andychou <andychou@google.com> | 2019-03-08 23:18:16 +0800 |
|---|---|---|
| committer | andychou <andychou@google.com> | 2019-03-09 02:06:17 +0800 |
| commit | 7a3b8109cf23d9d7a767c749b28b44e3510691ff (patch) | |
| tree | 8bf36c1848c6f860a3eca310e48d55979ba8a133 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4929093ff7e57893d449a4a0eb84e799cf015ee8 (diff) | |
| parent | 04d262db157f15c2d822708e57715d80e3f14585 (diff) | |
resolve merge conflicts of 04d262db157f15c2d822708e57715d80e3f14585 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I2c7feea798df2d9bbfae4ee0847ef151b0d21511
Change-Id: I417960cc1c873425ef6b9b5d74f9bf5d9658a390
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions