tree 32655a290df611143bab65ec89281553af67c9ac
parent f4b1101e5831faa5407e44566185007788090dce
parent a221a84208d65cd61e5e785be9f3a06243aa1235
author Bill Yi <byi@google.com> 1465838424 +0000
committer android-build-merger <android-build-merger@google.com> 1465838424 +0000

Import translations. DO NOT MERGE am: 83b18efa96  -s ours am: c2860718a4  -s ours am: d621f3a251  -s ours
am: a221a84208  -s ours

Change-Id: I679e71425e17c60c42cb8b9edf9403b8ba95275d