Skip to content
Commit 4c2bedc8 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: fe2d421f -s ours am: 5c0d577d -s ours
am: 3fa31fb1 -s ours
am skip reason: subject contains skip directive

Change-Id: I01e77ff2911042bf88181c67c1c1d85b76808e7b
parents 2fe1574e 3fa31fb1
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