diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-10 19:11:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-10 19:11:10 +0000 |
| commit | 0840f961e52d45df25f86b2390eb1afa7f3b4e90 (patch) | |
| tree | 04f41e4be9180272d77168760dabf8dfa36628d3 /tools/aapt2/diff/Diff.cpp | |
| parent | f8830fc514b2397c4f6477a03d7def4f60b093d3 (diff) | |
| parent | 2a5f0b4e3b144fa536c69cb80831b4a8678cc855 (diff) | |
am b7180c45: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: 2a5f0b4 -s ours
* commit '2a5f0b4e3b144fa536c69cb80831b4a8678cc855':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions