Skip to content
Commit 1d556c0d authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0571fa82 -s ours
am: 4912fe90 -s ours
am skip reason: subject contains skip directive

Change-Id: I79ce1a409c74c81f3ef5b7db970d0a99b6d5e14b
parents 6a87d678 4912fe90
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