Skip to content
Commit 63ac55dc 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: 801d1779 -s ours am: b87c62f3 -s ours am: 585f5f22 -s ours
am: 6db6f376 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bbd61ecd1577161fc446c2f00205a545d4fd8a1
parents 53c35e9b 6db6f376
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