Skip to content
Commit 66589029 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: 4ab9f885 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia2599d4a14af6a8c6d5b75f0afcdf00038a082f6
parents c0516df3 4ab9f885
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