Skip to content
Commit a59e4120 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-dev am:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc895 -s ours am: c67fc520 -s ours
am: 0de0845d -s ours
am skip reason: subject contains skip directive

Change-Id: Ic92b45c9e0bdca94a3036dacf62f4cd19aab4697
parents a333d032 0de0845d
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