diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-05 16:35:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-05 16:35:35 +0000 |
| commit | af0afe815eeb067421dbe781a9094472d0a56968 (patch) | |
| tree | d2704ca106b5bc372657ad238c1ec7227e268247 /tools/aapt2/diff/Diff.cpp | |
| parent | 8ccb29be62b29416f16ded4e16211d6b5d8f7deb (diff) | |
| parent | c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1 (diff) | |
am c0d2e7a6: (-s ours) am e229337b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c0d2e7a6fb294fcf27039ea0157fbbde17a9b1a1':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions