diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:12:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:12:18 +0000 |
| commit | 1781b7ed133b07574d33332f822d1bfe34748abe (patch) | |
| tree | 2b0443778f446ed62174af3633d69cf14fe3e540 /tools/aapt2/diff/Diff.cpp | |
| parent | 10600e982da5c85bdf5b17a36be437829b3ce4fb (diff) | |
| parent | 5a2b966ac490e59d0285934ac652dbaa02764f6b (diff) | |
am 5a2b966a: (-s ours) am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '5a2b966ac490e59d0285934ac652dbaa02764f6b':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions