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

Change-Id: I67b3d208b02e3095a7c21632d3b09244a499dc5f
parents 132a22ec cd1ef6fd
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