Skip to content
Commit cadc7822 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: e258cc65 -s ours
am: c954634c -s ours
am skip reason: subject contains skip directive

Change-Id: I0418856fe90f92c8bb87dbe625b684679cf0a264
parents 9a777f34 c954634c
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