Skip to content
Commit ca4b6752 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652 -s ours am: 95460d28 -s ours
am: 28c0ad92 -s ours
am skip reason: subject contains skip directive

Change-Id: I865c984a7d6b576ad049683fec5343ce93275436
parents dbb9753e 28c0ad92
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment