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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e -s ours am: 82d58c4a -s ours
am: 56870694 -s ours
am skip reason: subject contains skip directive

Change-Id: I55a3eb5983c61caf62a9b3e5feb79f9d52fcf18f
parents ca3fbc5d 56870694
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