Skip to content
Commit 4f522f60 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: 85c48edc -s ours
am skip reason: subject contains skip directive

Change-Id: I959988458fa524fb31392d79c3e8dd7ec80d3da5
parents 581268f5 85c48edc
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