am c159de74: (-s ours) am 4bafe763: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 5 Dec 2013 21:30:13 +0000 (21:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 21:30:13 +0000 (21:30 +0000)
commit606cca593f26beda8daaa8b3f6c53a9506ad48b5
treeae22d5ec608ca53ab0ffefb926efaefebfea5538
parent34f6f70e69b1e272e19a70c01964a122e4d117e7
parentc159de74b326050eeb3dc2683a3ab55cbed9aadd
am c159de74: (-s ours) am 4bafe763: (-s ours) Import translations. DO NOT MERGE

* commit 'c159de74b326050eeb3dc2683a3ab55cbed9aadd':