Skip to content
Commit 41e0d3a3 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: ad8a5939 -s ours am: bf00a737 -s ours
am: 27df4716 -s ours
am skip reason: subject contains skip directive

Change-Id: I25cadb38337eac4b6771fb2a4e69f5c4a1368f9f
parents e42a8e70 27df4716
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