Skip to content
Commit ded57ee6 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: 3ca8c70e -s ours
am: 2a6dabcd -s ours
am skip reason: subject contains skip directive

Change-Id: I28f28a12fb554a2791fff10d83bd30399c49a34b
parents 2e463f4b 2a6dabcd
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