Skip to content
Commit a090c99d 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: daeb1bb8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib337c45783afb639275ab68ab889b0d328409d90
parents 7fb9af42 daeb1bb8
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