Skip to content
Commit c1efa470 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: 80bbe491 -s ours am: ae54b7da -s ours
am: b3995514 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d6d989ef8ac47ec39fd3de174ef42108045abc7
parents cda3e162 b3995514
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