Skip to content
Commit 56b397e6 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: c0004871 -s ours am: d1809212 -s ours
am: 12258e0a -s ours
am skip reason: subject contains skip directive

Change-Id: I81403bfb96618721d760fc9bae8226743c814c10
parents 7ceea6ce 12258e0a
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