Skip to content
Commit 673e5d6d 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: 6aa3f389 -s ours am: 1daf3587 -s ours
am: 4a28946f -s ours
am skip reason: subject contains skip directive

Change-Id: I0fe48aed1e86bd485daf803e85f5f9d30d5ae06c
parents 6a1ec1b1 4a28946f
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