Skip to content
Commit 33e684bc 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: d3700eff -s ours
am skip reason: subject contains skip directive

Change-Id: I7092297ca8960d9612ef290b07892ec28025943f
parents 3cb14d32 d3700eff
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