tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 5168f039b3befcbf9fcd2f5b0ed316af10fb5acb
parent ed94b5520deed39c1d55f22d1281fb56433a3d28
author Baligh Uddin <baligh@google.com> 1445304711 +0000
committer android-build-merger <android-build-merger@google.com> 1445304711 +0000

am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2a6  -s ours am: 8a901a6133  -s ours am: 6cf8795a68  -s ours am: 2d714406cd  -s ours
am: ed94b5520d  -s ours

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