Skip to content
Commit 4617a582 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: c7bc6811 -s ours
am: 8de7a1b8 -s ours
am skip reason: subject contains skip directive

Change-Id: I663aed2c84134cd5a2c52020c9b4e79eb8623873
parents ed511cde 8de7a1b8
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