diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:08:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:08:48 +0000 |
| commit | bd30876a8f43510cb26100bf44e202394d75fe8a (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | eae9eb60a6b1e37abea341bf90361170c5a83b33 (diff) | |
| parent | b8758b39a937ed5b77ab90d5a446445741084b2e (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 091513d6e8 -s ours am: a0159dfc08 -s ours
am: b8758b39a9 -s ours
* commit 'b8758b39a937ed5b77ab90d5a446445741084b2e':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions