Skip to content
Commit ee3c9276 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: c3ee236a -s ours
am: 1c449333 -s ours
am skip reason: subject contains skip directive

Change-Id: I0b4e214eece93ba9dea75bf8f397a3b36e8b2b7e
parents 50164915 1c449333
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