Skip to content
Commit d56027cd 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-dev am:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d1779 -s ours am: da046065 -s ours
am: 34f88bfe -s ours
am skip reason: subject contains skip directive

Change-Id: Idf9bc7043d944737ae726a2fb1ca69b83c1f5cdd
parents 6e3edc41 34f88bfe
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