Skip to content
Commit e1e3df57 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: 949a22d7 -s ours am: aae54869 -s ours
am: 4341a608 -s ours
am skip reason: subject contains skip directive

Change-Id: I9204fae2fdfdee509c15d3e8e175298400556dc7
parents 64b681aa 4341a608
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