tree de5df758f90250e5a008fc6704e758cf82ae2942
parent 436044e1cbf7c57af854978ece9474ab7a7512b3
parent 32414cd2408c7282950b1ec492143dfac888e03f
author Bill Yi <byi@google.com> 1475313040 +0000
committer android-build-merger <android-build-merger@google.com> 1475313040 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 4408ea334a  -s ours
am: 32414cd240  -s ours

Change-Id: I076e8eef623604aaebf345cd1f7cfdef38831f04