am f89882e4: (-s ours) am 7a518a30: (-s ours) am 09128d0a: (-s ours) Import translati...
authorBaligh Uddin <baligh@google.com>
Wed, 29 Oct 2014 07:00:57 +0000 (07:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 07:00:57 +0000 (07:00 +0000)
commit756eae438fda5154b3416dd081c6a5f0a6e99a31
tree423790d8126acd6beee6ef43e62eb651e0265fda
parent236f189fdae942241e918f9fb99ff90172f71ece
parentf89882e431314ac3fa3b1f786c8c394631faec25
am f89882e4: (-s ours) am 7a518a30: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE

* commit 'f89882e431314ac3fa3b1f786c8c394631faec25':