Skip to content
Commit 60534a8d 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: c0004871 -s ours 

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

Change-Id: Ibdbcf6f0094782d13c57be50582b6671cd41dfa4
parents c9f3d2d6 d1809212
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