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

Change-Id: I5069111b0dc2c4e73526f2d76288edf93004b102
parents 8222ef5c bd99f25f
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