tree c68cd4eae5e1ec9f9a87785593ff553a9dca0454
parent 42e6053970f00453277ba876b04b34b1e12869ef
parent a42bca855509b3360cdf42a1f5677682d1d074b6
author Baligh Uddin <baligh@google.com> 1461795925 +0000
committer android-build-merger <android-build-merger@google.com> 1461795925 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899  -s ours
am: a42bca8  -s ours

* commit 'a42bca855509b3360cdf42a1f5677682d1d074b6':

Change-Id: I80a1b3a9693ce901bd3c0cf1149a562b8addeedb