Skip to content
Commit 5149e34a 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: 0571fa82 -s ours
am skip reason: subject contains skip directive

Change-Id: I9d717c450b569fc860df0754d6db280d26d52e12
parents c0312f75 0571fa82
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