tree c68cd4eae5e1ec9f9a87785593ff553a9dca0454
parent f1d2140d1a4803257b78537ed0735dc540089669
parent abd098801198a696914e4d2ccaae95ed9fa3f944
author Baligh Uddin <baligh@google.com> 1461793349 +0000
committer android-build-merger <android-build-merger@google.com> 1461793349 +0000

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

* commit 'abd098801198a696914e4d2ccaae95ed9fa3f944':
  Import translations. DO NOT MERGE

Change-Id: Ib7ea003744e6691aacdb365126784e50d5eaf2a4