Skip to content
Commit a44fe677 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: 2f5007db -s ours
am skip reason: subject contains skip directive

Change-Id: I0ee7268a62a9ba07a758dbe07f16fb019012265e
parents 3c34ea26 2f5007db
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