Skip to content
Commit 9d86289f 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-qpr1-dev 

am: be592d32 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic60a82f7aa092e2c117ac5879cf7dcbaaafb4af3
parents 43ee27f9 be592d32
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