Skip to content
Commit df2cca32 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: 2d33bb61 -s ours
am skip reason: subject contains skip directive

Change-Id: Id5f23df67795f9cef6f86609814ae82231c602de
parents 0ee35962 2d33bb61
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