Skip to content
Commit 0de0845d 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: c26bc895 -s ours 

am: c67fc520 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib882f7ae005c6358df053564a24c80ca94e42f64
parents 0733b635 c67fc520
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