Skip to content
Commit a08b7961 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: a7608610 -s ours 

am: 03efc6a9 -s ours
am skip reason: subject contains skip directive

Change-Id: I373c707d70a9b2ab3bbc0109bab8a34e3c5f3988
parents 2e5d3514 03efc6a9
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