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

Change-Id: I53ac7a4e20798487379f8486eb81c6b72d529da5
parents 3bd2895b ab6ef4f0
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