Skip to content
Commit 357e43f0 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: 6bb7446c -s ours
am: c0516df3 -s ours
am skip reason: subject contains skip directive

Change-Id: I30aed19986111711561e67a3e9713a9d242c5ab5
parents e719bcbe c0516df3
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