tree f98b5f81d085787dacd8671cf0f5ed1dafc8d7f9
parent d1b202d059c405a864c468ee4e1deed5d6dd5448
parent 6b98b4d55946ebf00c3a7f462a60e96bca6ae659
author Bill Yi <byi@google.com> 1478608043 +0000
committer android-build-merger <android-build-merger@google.com> 1478608043 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978  -s ours am: 5501036062  -s ours am: 01c4a57a8d  -s ours
am: 6b98b4d559  -s ours

Change-Id: Ie18ccbbd3d9583e102c201b8af40e96867bf6f6a