tree 8bdc9e5eedefcfb44ee6e87c13faf300a3512016
parent acb237644c07eef292d3e597546589d46f19c0d2
parent da3f395420e2fa73c4ba81f20b480222da80b36b
author Bill Yi <byi@google.com> 1470421951 +0000
committer android-build-merger <android-build-merger@google.com> 1470421951 +0000

Import translations. DO NOT MERGE am: a9d39db63b  -s ours
am: da3f395420  -s ours

Change-Id: Ida0a4fc466a3d363f3d054b23f834fc9a5e6f38c