Skip to content
Commit 57e1e73b 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-r1-dev... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 1b7a7012 -s ours
am: de7087b5 -s ours
am skip reason: subject contains skip directive

Change-Id: If79c99c5ae9a1a4775db57fae98657589ef015de
parents 489e34f5 de7087b5
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