am 2928cd4d: (-s ours) am ee66c24b: (-s ours) Import translations. DO NOT MERGE
authorBaligh Uddin <baligh@google.com>
Thu, 22 May 2014 03:28:39 +0000 (03:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 May 2014 03:28:39 +0000 (03:28 +0000)
commit70285657e8113c6648f99e542c8408b6703f5a89
tree4d025e875273ea9d0c614478f7c5da542136680b
parent16122ab66d975b93265747266f72c1ffbec095f0
parent2928cd4db362dd6b0a575f43d77defbc6cf26590
am 2928cd4d: (-s ours) am ee66c24b: (-s ours) Import translations. DO NOT MERGE

* commit '2928cd4db362dd6b0a575f43d77defbc6cf26590':
  Import translations. DO NOT MERGE