am 1eb8eb9c: (-s ours) am 870ab30a: (-s ours) am c7f102af: (-s ours) am f4b1e9c8...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 07:19:56 +0000 (07:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 07:19:56 +0000 (07:19 +0000)
commit2592fa2eb3b9a7c38d106769cfdf392a20863499
treebdab528f94c29a736ffbbe8a891b9c79be077dcb
parent6add0d7baf7874b251a9621eb10f8049580d70ff
parent1eb8eb9cf5bf5fbbfaa06ccc1d508b7416b7b814
am 1eb8eb9c: (-s ours) am 870ab30a: (-s ours) am c7f102af: (-s ours) am f4b1e9c8: (-s ours) am 09128d0a: (-s ours) Import translations. DO NOT MERGE

* commit '1eb8eb9cf5bf5fbbfaa06ccc1d508b7416b7b814':