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

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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: aaea2b58 -s ours
am: 84345490 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia10d2767b3ab9eaaf5f616226851914b2ce47961
parents e229469a 84345490
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