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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master 

am: 48de73d2 -s ours
am skip reason: subject contains skip directive

Change-Id: I67f43c0be73d65e62c509b6b2f1fd3d3257b80fe
parents 850e3c7f 48de73d2
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