Skip to content
Commit ff59a09b 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: 3ca8c70e -s ours am: 2a6dabcd -s ours
am: 80940c88 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0ac478c71e05a3546e652d49fe3b7bf714b97db
parents 2bb67342 80940c88
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