Skip to content
Commit 1e884540 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: 7c1a8a42 -s ours
am: 2d4c7f4d -s ours
am skip reason: subject contains skip directive

Change-Id: Ib5048a24d391adb4cbe3e0ef235e14e814fc855c
parents affa2ff5 2d4c7f4d
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