Skip to content
Commit f292afc1 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: 7e5f2498 -s ours
am: c9f3d2d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b2acbe3d46cddaf7840bc9167bd5836c3296864
parents 9c74836d c9f3d2d6
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