Skip to content
Commit 6a1ec1b1 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b672a3f6 -s ours
am: 0d200f3d -s ours
am skip reason: subject contains skip directive

Change-Id: I63d5149da0b1657a976be5004f2199b0ec798068
parents 904bba5e 0d200f3d
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