Skip to content
Commit b1547258 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: 0bc8e73e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic15b017eb1cdadc0279c6ac187486b0eabe811a7
parents 86ff1a8c 0bc8e73e
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