Skip to content
Commit 5e7a4efa 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: 568b02ee -s ours
am skip reason: subject contains skip directive

Change-Id: I9ec14c25e952bf3c21d7895800d0b8b76539a99c
parents 5e59d60b 568b02ee
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