Skip to content
Commit 14220a3c 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: da2d0d13 -s ours
am: 17fb77b6 -s ours
am skip reason: subject contains skip directive

Change-Id: I38e4ec78f3dd2331a5d6b172f48aa8c30844d3d1
parents 6abd0960 17fb77b6
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