am 179f97a5: (-s ours) am ee5b3196: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Wed, 23 Apr 2014 02:30:18 +0000 (02:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 Apr 2014 02:30:18 +0000 (02:30 +0000)
commitc1f26c017e7e186403c3c4bbb58fadfdf8c12945
treea5e4bf2a6765dd4df336f7d6660f0531aac446bf
parent8b3bbe66abdd210c456c971de4190126dcf95aa3
parent179f97a53b8999f7ffa1c19bd2ad9d5bf72fdbe0
am 179f97a5: (-s ours) am ee5b3196: (-s ours) Import translations. DO NOT MERGE

* commit '179f97a53b8999f7ffa1c19bd2ad9d5bf72fdbe0':
  Import translations. DO NOT MERGE