Skip to content
Commit 67503bd9 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 3390e7b7 -s ours
am: 6c765a1e -s ours
am skip reason: subject contains skip directive

Change-Id: I996be67d182764064c47efae82f004e05605f20c
parents 7c8835db 6c765a1e
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