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

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:... 

Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a1  -s ours am: 995029b5  -s ours am: 1e8ed22b  -s ours am: 9b16c7b2  -s ours" into oc-mr1-dev-plus-aosp
am: c015001f  -s ours

Change-Id: I4acc5b60ba716f7f57e74f1744a4bb138dc6d073
parents 4ac07380 c015001f
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