Skip to content
Commit e9af9acf 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: 835f260d -s ours
am skip reason: subject contains skip directive

Change-Id: I7198df57477c246db6ad226f2ca7c0b54a15e6f5
parents 8b1112c5 835f260d
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