tree 9e7efa02848c6b56f7d49acc618b72314d32a122
parent a6f341ebed653cbea825dde8842594b79292bbac
parent 684d255b110a538b98f57db933d6fe53c267b8c0
author Bill Yi <byi@google.com> 1508514834 +0000
committer android-build-merger <android-build-merger@google.com> 1508514834 +0000

Import translations. DO NOT MERGE am: 9bc56553dd  -s ours am: 63405d5d1c  -s ours
am: 684d255b11  -s ours

Change-Id: Ib46540b810ba2337106b5548337ce7cb6fe77a82