Skip to content
Commit 9e27e75c 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-r1-dev am: e876855f -s ours
am: a7a1f96b -s ours
am skip reason: subject contains skip directive

Change-Id: I7bfcbfb1f9769c0beae7b41beb5ee6854f30df06
parents 7e550e47 a7a1f96b
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