Skip to content
Commit 58ca2d74 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: a6d9bffb -s ours
am: d8c0c9ea -s ours
am skip reason: subject contains skip directive

Change-Id: Icbda1dcfee132ce34e7571f16d1b0167e6a85f41
parents a0c00cf0 d8c0c9ea
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