Skip to content
Commit a0c00cf0 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: 5e0da71b -s ours am: 61476267 -s ours
am: 4b5e5899 -s ours
am skip reason: subject contains skip directive

Change-Id: Id0eac84146894f514697ac959b9a6dbdfa638c15
parents 535a6f9d 4b5e5899
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