Skip to content
Commit 7002e2a9 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-r1-dev 

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

Change-Id: I2bb88ed792c2b4525acd2377c59bb31379e55ed7
parents 83392f44 b7ad07ad
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