Skip to content
Commit 13444159 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: da2d0d13 -s ours
am: dbdccc80 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib32d43d42af356c6198209a7bfd44ea0c6f944db
parents c7f1a16c dbdccc80
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