tree 32c6eb7e51b07678c1266fd5899e44931e070e0a
parent 7df56291c074db41890cc42aab7c2e2a7ac1e149
parent 1efc63d9d4c403e4bdbcd8dcccffa308c44399c7
author Bill Yi <byi@google.com> 1499743317 +0000
committer android-build-merger <android-build-merger@google.com> 1499743317 +0000

Import translations. DO NOT MERGE am: 28b67f8eea  -s ours am: 9839965b25  -s ours am: 04e1d6ebd9  -s ours
am: 1efc63d9d4  -s ours

Change-Id: Ie810f9995732ff09b79fb3ac9858059a5596dc17