Skip to content
Commit 7ceea6ce 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: cc13f9ed -s ours am: 49a60e6b -s ours
am: 157a81d9 -s ours
am skip reason: subject contains skip directive

Change-Id: If786fcdfa4959e72aa288ecc7abef1d05e238749
parents e69b008c 157a81d9
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