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

Change-Id: I925fe54cbbd0ae21a6b1a4b39456e1f31ff9b759
parents 9953c829 eec208ec
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