Skip to content
Commit 6b24bafe 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: 1feb0dfd -s ours am: 35d50b84 -s ours
am: b3e35759 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdc56598c110b32325622722b38cc70f2687d764
parents 3de0e8a8 b3e35759
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