Skip to content
Commit 876e21a3 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-qpr1-dev 

am: ed1acb11 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4be920322d722c35857a2b84bd9da9c7bbd9a7e
parents f93cf937 ed1acb11
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