Skip to content
Commit fda800f6 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8a201f04 -s ours
am: e4673277 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b379cde2b2e2bbce22b5cb24e958930c26e2010
parents d9b82e2c e4673277
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