Skip to content
Commit b76ec78f 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: ad8a5939 -s ours am: 4898d827 -s ours
am: 9c27a482 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib5bf049d789cb21265f2c0816ef0e40444d2236f
parents 41e0d3a3 9c27a482
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