Skip to content
Commit f986b4e9 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: 76a8d1c2 -s ours
am: cb227741 -s ours
am skip reason: subject contains skip directive

Change-Id: I3ddbabefbd1cf5b49eea797eb6b7d2d96ee6016c
parents dcf78a38 cb227741
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