Skip to content
Commit 167cb383 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: bde6a92a -s ours 

am: 9a259d5d -s ours
am skip reason: subject contains skip directive

Change-Id: I4f33b4d7230f327934c3572c2f8a89e0b1b5adeb
parents 50daa9a7 9a259d5d
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