diff options
| author | Mark Renouf <mrenouf@google.com> | 2016-09-12 15:58:47 -0400 |
|---|---|---|
| committer | Mark Renouf <mrenouf@google.com> | 2016-09-12 15:58:47 -0400 |
| commit | 0e37fdb7abe706e6f7374cc3b8d830f13653c4fc (patch) | |
| tree | 26ea235a70411cffb97bd7607bd99c253496fc70 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b4b51ec3c18ecdd25496ce76005c536223870c2d (diff) | |
| parent | 292c86dac9d7bdf739a88cd8d7ff86f084c81334 (diff) | |
resolve merge conflicts of 292c86d to cw-f-dev
* commit '292c86dac9d7bdf739a88cd8d7ff86f084c81334':
Mark 'candidates_style' as not translatable
Change-Id: Iec80465ddea997460c7e1c50f3b229373b666107
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions