diff options
author | Roozbeh Pournader <roozbeh@google.com> | 2016-06-23 22:11:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-23 22:11:54 +0000 |
commit | d393bedca0096fa5ad9b4f3d7c89b1d68af1201b (patch) | |
tree | 7add03d323c286c85ed1bf43f4194283e7989d70 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 02b5e83589b0a756139fb3f3ce02e537954aa033 (diff) | |
parent | 345f70e949db6374d6a472b376da225b7c4e8802 (diff) |
Merge \\"Revert \\"Revert \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\"\\"\\" into nyc-mr1-dev am: 60882f517d
am: 345f70e949 -s ours
Change-Id: I8f618935ca0d76354008789cccaeeae051648c8c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions