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

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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b37de731 -s ours am: 0e5c34bb -s ours
am: c0addd1f -s ours
am skip reason: subject contains skip directive

Change-Id: I15f5e9e361edf4a6491a6e04cf70e826d91bdc53
parents 95a636d3 c0addd1f
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