tree 898b8d010517b43cb5ec2c2c05a85d93f27c4a45
parent 977d5bbfd2f67d18978ab55fbf26cbcfc282283e
parent 9aed8c2fa01785be20cd7cc07976670812bc84a0
author Bill Yi <byi@google.com> 1464317232 +0000
committer android-build-merger <android-build-merger@google.com> 1464317232 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9aed8c2fa0  -s ours

* commit '9aed8c2fa01785be20cd7cc07976670812bc84a0':
  Import translations. DO NOT MERGE

Change-Id: I0305b137eed7ecf9e4b149a0f589e658de16811f