tree 3ffa5e33e19e34eb670e3f939fd86e1cc3ffe48e
parent 0630d92064e86334519207129b446b45388a5743
parent 65266b99d2b226e5b6cc906cfeb3d31483221ffc
author Bill Yi <byi@google.com> 1466071414 +0000
committer android-build-merger <android-build-merger@google.com> 1466071414 +0000

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2  -s ours

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b