Skip to content
Commit 330203fa 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: 2080a059 -s ours
am: 0a7c2433 -s ours
am skip reason: subject contains skip directive

Change-Id: I28f0b3c2a697fea0460cb33baf9fe568218d848a
parents fa5d644e 0a7c2433
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