Skip to content
Commit 4a28946f 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: 6aa3f389 -s ours 

am: 1daf3587 -s ours
am skip reason: subject contains skip directive

Change-Id: I9f6cf01461a0bb3c183b83a479ff34cb547c74de
parents 0d200f3d 1daf3587
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