diff options
| author | Bill Yi <byi@google.com> | 2016-05-31 04:06:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 04:06:13 +0000 |
| commit | e53394400c1a3eba6cc061de57b2e2cf16faddaa (patch) | |
| tree | 687e02d8a9bb297aae5957def4159c5e97df0f16 /tools/aapt2/diff/Diff.cpp | |
| parent | 6d160e9b8d260c1609e6df05215a6b6300ae6fe9 (diff) | |
| parent | 5854f2aa077e5ceba2977724f71162eaf3faa384 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5854f2aa07 -s ours
* commit '5854f2aa077e5ceba2977724f71162eaf3faa384':
Import translations. DO NOT MERGE
Change-Id: I565899541685a2f1951c35d8a07b4f29ca5eae3e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions