Skip to content
Commit bd1f8940 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: fccf9d03 -s ours
am skip reason: subject contains skip directive

Change-Id: I4b66bd86ad4e12f743eefebf9b25e0f7115829fc
parents ec3ce576 fccf9d03
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