tree fc9702f012503330039033d43b48f09fe27ebb81
parent 72d21724e55f1282ab857dd2a12a71f94ab0d9a2
parent c08950cbbd4b0c84722ba210ba67cecef3df871b
author Bill Yi <byi@google.com> 1499744847 +0000
committer android-build-merger <android-build-merger@google.com> 1499744847 +0000

Import translations. DO NOT MERGE am: eb354d0fc8  -s ours
am: c08950cbbd  -s ours

Change-Id: If3bea6c155875d2288fa00e198a1a0083dea9af6