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

Change-Id: Ic61fe0bde09a0bb7884b1338e2228d6146c8ff96
parents 3cf1c83e f1d7d5e2
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