Skip to content
Commit 549fd862 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed -s ours am: 4c20c8c1 -s ours
am: 49377c15 -s ours
am skip reason: subject contains skip directive

Change-Id: I25482f70f8c596f7df1ee4f69e3153e0dc7799f9
parents 712ffbb9 49377c15
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