Skip to content
Commit c805741b 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: fe2d421f -s ours am: 5c0d577d -s ours am: 3fa31fb1 -s ours
am: 3df86ce4 -s ours
am skip reason: subject contains skip directive

Change-Id: I50522a70be353869689ee8a4dd7684ccbe0f7214
parents e62a7cc3 3df86ce4
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