Skip to content
Commit 48dcfd57 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: a83b18cc -s ours
am skip reason: subject contains skip directive

Change-Id: I6c049537831a6749b1933cbbdb831d1cffa770fb
parents a8d99bd9 a83b18cc
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