Skip to content
Commit 000a882b 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: 8931739c -s ours 

am: eb16f029 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a695b9f3f33b26f480d94195bafc08cf823f6c0
parents 70ed26b9 eb16f029
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