Skip to content
Commit 162fea1e 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: 2a12d1e6 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e56edaab21b3503e9c90bc6da1dd980a700c3d6
parents 61aa9ece 2a12d1e6
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