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

Change-Id: I49ce26d7bc30b12a978b7ce61928eb40a531aa49
parents 8690600c c7bc6811
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