tree e71199f0a281eeed0f67f3e347f03624462bad45
parent c611158092b477bcf1ed40b136ba5e3cf253dc95
parent 6870a211c0c4f813094113423fc09eabe186465c
author Bill Yi <byi@google.com> 1512084827 +0000
committer android-build-merger <android-build-merger@google.com> 1512084827 +0000

Import translations. DO NOT MERGE am: bd6b3d810b  -s ours
am: 6870a211c0  -s ours

Change-Id: Ifd7aac628a8b9240303452e557cefdcee69109c9