Skip to content
Commit c0516df3 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-qpr1-dev 

am: 6bb7446c -s ours
am skip reason: subject contains skip directive

Change-Id: I22cc9ef2c269d7ce659ac806ee0502affde02727
parents 876e21a3 6bb7446c
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