Skip to content
Commit 4341a608 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: 949a22d7 -s ours 

am: aae54869 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie86250ef0189ab701bf8f801c90310d2df915aaa
parents f788b51e aae54869
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