diff options
author | Selim Cinek <cinek@google.com> | 2016-10-13 01:00:24 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 01:00:24 +0000 |
commit | cb654a5fbd0e5cdc6b4fa7ce7e0dfca26ac40953 (patch) | |
tree | e3fffb45d771216526aa4d0d7fb7a7390a4273d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6f8c54a16de277e83332f586b6f2e32e12cbff9b (diff) | |
parent | d33e79c328f368064bf64cecedbba9a21a7f6ad0 (diff) |
Merge "DO NOT MERGE - Added translations for emergency action string"
am: d33e79c328 -s ours
Change-Id: I3fe6f222f2c70a0b50147f5439c54d8553dda092
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions