Skip to content
Commit 96bda9de 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: 33cc3500 -s ours
am: 8fa925d0 -s ours
am skip reason: subject contains skip directive

Change-Id: I316b241d5460c59ec84567e51550bc6418dffb42
parents e1e3df57 8fa925d0
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