diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:03:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:03:41 +0000 |
| commit | 5f3cf49667874ed01895994078872a1766543d99 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | a7ccf85e15d784da2a5dd1b69ba82585a2f2e518 (diff) | |
| parent | d5668a4a887226e6ba92d3c68c9d9bdb2257852f (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 1974686db5 -s ours am: a85507482f -s ours
am: d5668a4a88 -s ours
* commit 'd5668a4a887226e6ba92d3c68c9d9bdb2257852f':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions