OSDN Git Service

am 0c0c0e4a: (-s ours) am 48b5f4b1: (-s ours) am 73a2208d: (-s ours) am b158819d...
authorBaligh Uddin <baligh@google.com>
Thu, 19 Dec 2013 06:00:41 +0000 (22:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 06:00:41 +0000 (22:00 -0800)
* commit '0c0c0e4a267d41d66382c6d070cbea98f2407b47':
  Import translations. DO NOT MERGE


Trivial merge