tree f4339400ae765f628c1d32abd4ffc9943f11591f
parent ea7fc96298e892daf1331d485468cedcb134b953
parent b7bc3a8582e65c406bf06614a189ea0970767e97
author Bill Yi <byi@google.com> 1479953201 +0000
committer android-build-merger <android-build-merger@google.com> 1479953201 +0000

Import translations. DO NOT MERGE am: d730a04ef7  -s ours am: db360b65d4  -s ours am: 957c65fe13  -s ours
am: b7bc3a8582  -s ours

Change-Id: Idba06804823ab726c160097951cde0406972007e