Skip to content
Commit 7aee9fbb 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: 5a9d1aa9 -s ours
am: 55ec3e3b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibcb01683b85b7a3c365daeba0fff8c16bccc4e43
parents 67503bd9 55ec3e3b
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