Skip to content
Commit 608ad1ee 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: 801d1779 -s ours am: da046065 -s ours am: c0491bf9 -s ours
am: 8986f7c5 -s ours
am skip reason: subject contains skip directive

Change-Id: I321a8985140a10dddbe92cd435e81105bd409874
parents c3d83841 8986f7c5
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