tree 1678aa1dde998d320e62cdfd2b1783f111b5379b
parent 7148b15bae3d2811b3fd5596a41120d7bbcca61a
parent af300c651304c78c1b81955778c5f566dd56226b
author Baligh Uddin <baligh@google.com> 1463959375 +0000
committer android-build-merger <android-build-merger@google.com> 1463959375 +0000

Import translations. DO NOT MERGE am: 15b2a3468e  -s ours
am: af300c6513  -s ours

* commit 'af300c651304c78c1b81955778c5f566dd56226b':

Change-Id: Icf54651cb4b714e095b1eafb7aa8627ae2e7a86f