OSDN Git Service

am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 19 Dec 2013 00:25:00 +0000 (00:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 00:25:00 +0000 (00:25 +0000)
commitf5570908a5acc1f68128c974abcfb0117a44589d
tree9a44ea6b7824609363ae04ec9de7c16370fdba5d
parentcdbf1e0c5bc133cd4f8f8d6e86c28eabc0812730
parent53ca3018beb1a7a12d12cddfbc433d50ca793cf9
am 53ca3018: (-s ours) am 17b489f3: (-s ours) am 50391871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '53ca3018beb1a7a12d12cddfbc433d50ca793cf9':
  Import translations. DO NOT MERGE