am fc6d1ead: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Fri, 27 Dec 2013 03:55:07 +0000 (19:55 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Dec 2013 03:55:07 +0000 (19:55 -0800)
commit5bafb68f64d87fecd4f871b2f27df5d037292f5f
treea3aaf2d222ef5feebfcca9a81c7548a8964ec8da
parenta0daefb0032289905ab369b98a886dc322346e9c
parentfc6d1ead7d7abf97e5cf28f8871cf3dd0c09bd97
am fc6d1ead: (-s ours) Import translations. DO NOT MERGE

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