Skip to content
Commit ab001201 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: 403c841e -s ours
am: 62173d1e -s ours
am skip reason: subject contains skip directive

Change-Id: Iad0180bcffba293dceca39540d9ddc85b7a29b45
parents 1eb7851c 62173d1e
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