Skip to content
Commit 72d61607 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-dev am:... 

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db -s ours am: a44fe677 -s ours
am: 8c482c95 -s ours
am skip reason: subject contains skip directive

Change-Id: I45be259f87e60be6f1fd27c13f80b0872be2b4c2
parents b5f68547 8c482c95
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