Skip to content
Commit 69297dcb 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: 0d2a5f94 -s ours am: 6833e6e3 -s ours
am: 3ce200f8 -s ours
am skip reason: subject contains skip directive

Change-Id: I07846b5b6011f07e0c0137a644858ad4f29dc5ad
parents 42301182 3ce200f8
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