tree 77dd74e3396424ca69b411694f00cb92f8a12724
parent b98e5058aa917e867032fc3f38567628ffbac701
parent de9f8fbc91dfb5b7519a85c81cf5a3bae7be11c8
author Bill Yi <byi@google.com> 1502086557 +0000
committer android-build-merger <android-build-merger@google.com> 1502086557 +0000

Import translations. DO NOT MERGE am: 18a114896c  -s ours am: d79cff78c7  -s ours
am: de9f8fbc91  -s ours

Change-Id: I6ef69ba1f16d24cfa93de64e91276b96c612d51f