diff options
| author | Selim Cinek <cinek@google.com> | 2016-10-13 14:28:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-13 14:28:39 +0000 |
| commit | 8bd7df4536c91320d19a2508d184cb74c50f4f05 (patch) | |
| tree | 7c7ee3dd0d496d3bc8c6998b13b339929cc34936 /tools/aapt2/diff/Diff.cpp | |
| parent | 2b06e19f2de3adf730ba01ad9bf4cb1b8bd12b8e (diff) | |
| parent | cb654a5fbd0e5cdc6b4fa7ce7e0dfca26ac40953 (diff) | |
Merge "DO NOT MERGE - Added translations for emergency action string" am: d33e79c328 -s ours
am: cb654a5fbd -s ours
Change-Id: I54c256a00fa10c6eaffc6acb4108e81144ec2722
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions