Skip to content
Commit 6abd0960 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b8631923 -s ours
am: 258eba10 -s ours
am skip reason: subject contains skip directive

Change-Id: I68c2eb28f9d617d4e24d140001f2671a59d8a820
parents 6c4b6f82 258eba10
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