Skip to content
Commit ef6abc8c 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: 4769e819 -s ours
am: ba873788 -s ours
am skip reason: subject contains skip directive

Change-Id: I251ca6b8fa29a7bc4b9049d8dfb014da444aff95
parents bd03235b ba873788
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