Skip to content
Commit 84316e72 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: c760a652 -s ours 

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

Change-Id: I2d9c5e4a863f324c8b8504556a1e85d0e8c777f7
parents af198494 fcb0fc43
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