diff options
author | Roozbeh Pournader <roozbeh@google.com> | 2016-06-20 22:04:06 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 22:04:06 +0000 |
commit | c85f05fa110180122b4b5cd24c431bc3a6eb388e (patch) | |
tree | 3f678ca0bc4e0cbd870b4f083aae18492c516c91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4244c289fc9a839ac4ffde6bb828c3196e0b685e (diff) | |
parent | 295bdbb727912ac4b7ac7ca7604a3d86f2bb8e5a (diff) |
Merge \\\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\\" into nyc-dev am: 160126e2d8 am: 1f2f328025
am: 295bdbb727 -s ours
Change-Id: I5b06a39252c89ded78c0143614328298199446c1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions