Skip to content
Commit 57ac1832 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: 15995dac -s ours
am skip reason: subject contains skip directive

Change-Id: I94fea496d08b5d61d31a895e78b2cc8617205fb7
parents 5d3144be 15995dac
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