diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2018-01-31 16:04:06 -0800 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2018-02-01 00:13:15 +0000 |
| commit | 7914797d02c166801a6f12713bdc253bf0430534 (patch) | |
| tree | 63ff38330b89a2eb91643bb2a31415702954eebb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5f2a4ef763ef416c5954836c1d178188c38765d6 (diff) | |
Fix build breakage caused by proto conflict
Two proto constants were merged at the same time,
causing a conflict.
Test: none
Change-Id: If429fc28d8f2c37c19945a7cffe1147770ea447d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions