tree cc57e87f03e20df5846ed8c61c2fd0b4f50aec94
parent 7c18f52452774d1a9c92d9631abdd45053b76224
parent b597ff837cf202da77aadb70fcc588023e79da9f
author Bill Yi <byi@google.com> 1508134075 +0000
committer android-build-merger <android-build-merger@google.com> 1508134075 +0000

Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours am: 7e3f20e249  -s ours
am: b597ff837c  -s ours

Change-Id: I4372cfb4a6dc243e9915d40f147a38119e4d1666