Skip to content
Commit 3daa38b7 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: 25a43f36 -s ours am: 37caf481 -s ours
am: 1f87082f -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4e9b31a09c3e97f205f03f7b97b18ac2afd1a65
parents 34b8a8e2 1f87082f
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