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

Browse Source

am: 957b4da1b0  -s ours

Change-Id: I52af21d975efe813b557f52e4646d7af629fe8c6

main

Bill Yi 2018-08-04 18:09:54 -07:00 committed by android-build-merger

parent 50ae03af3f 957b4da1b0

commit 5511368d7e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available