Skip to content
Commit 763ca762 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: ec9d9834 -s ours 

am: 1ace2885 -s ours
am skip reason: subject contains skip directive

Change-Id: I37e30e4c9acbe62bff895b80b39b4e28f4490df5
parents 90d5bc26 1ace2885
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