tree 056848d6b01063c7dffe1c35e88f7eb3eb1bf274
parent 1e20cf53cb6edb9f3fd3ab62730e11a05e6e5b50
parent 6ccb5afd56bc13598b290b5cef15b53cb09ed910
author Bill Yi <byi@google.com> 1524891037 -0700
committer android-build-merger <android-build-merger@google.com> 1524891037 -0700

[automerger skipped] Import translations. DO NOT MERGE am: fb4361591a  -s ours
am: 6ccb5afd56  -s ours

Change-Id: I28a1b5ffb4f3606997109e04505a5ea485b089f6