Skip to content
Commit 49a60e6b 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: cc13f9ed -s ours
am skip reason: subject contains skip directive

Change-Id: I67ecd75a9d2048417da9dd0fda82bcd650e2127e
parents 453efcb3 cc13f9ed
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