Skip to content
Commit 4b279cd1 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: 7350ab11 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9f7afad8b689871fb3093d5814e8695c1393ce6
parents 55ec3e3b 7350ab11
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