Skip to content
Commit 0527c809 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:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a7608610 -s ours am: 03efc6a9 -s ours
am: a08b7961 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b1eb9ba8e44eb45b09e1974bb66e0d500c6520c
parents a103ad19 a08b7961
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