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

Change-Id: Ic3e648121dcf4f59ce92ab8dc874733ebe56261a
parents 0bf7e8d6 2d016d1b
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