tree 33b41468ff75e350ffdd075dfbadd74468f867ce
parent a1f6199fb9ac99435ce3551d03d1c34c4a83dcf6
parent ce7d13e9e69a886f3cd5117cc4060a38885b5d10
author Baligh Uddin <baligh@google.com> 1462370650 +0000
committer android-build-merger <android-build-merger@google.com> 1462370650 +0000

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

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

Change-Id: I4ca603cdefb3c97bc2544d0e36da7b39453cc2b5