Skip to content
Commit 581268f5 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: 8dfcae26 -s ours
am skip reason: subject contains skip directive

Change-Id: I416874fe5e5440dc9a1a8fc89e84ab7f34638153
parents 34cef659 8dfcae26
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