diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-23 14:32:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 14:32:42 +0000 |
| commit | 9dd645bdd0512456860a0fec66351dfed966b8c0 (patch) | |
| tree | 8c7f309be6c6cb6fed17837c1ee688d643023360 /tools/aapt2/diff/Diff.cpp | |
| parent | 0c2de5faa50ed01dda4d2ad14666d64e2dd8c9ca (diff) | |
| parent | 84cd5f64c340067b1a8e3e7a7c7d1e86ca155313 (diff) | |
am 84cd5f64: (-s ours) am e74331dc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '84cd5f64c340067b1a8e3e7a7c7d1e86ca155313':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions