Skip to content
Commit d0097c6e 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: c26bc895 -s ours am: 3c3317af -s ours
am: 97916f9e -s ours
am skip reason: subject contains skip directive

Change-Id: If4d9d05d3bbc07829deb0a039b68d5510ce4fc76
parents a59e4120 97916f9e
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