Skip to content
Commit 683a276b 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: 8c7a9b95 -s ours 

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

Change-Id: Id8c2d9cbe49e74e0906ab8d0bee128f71db0efa1
parents 0a179011 b22a7fde
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