Skip to content
Commit 64d07244 authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev 

am: a487c584 -s ours
am skip reason: subject contains skip directive

Change-Id: I84207ea9ed424d36dc3a0d36a9582a8ef82854c2
parents cf88c4d6 a487c584
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