OSDN Git Service

am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 18:47:45 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 18:47:45 +0000 (18:47 +0000)
* commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0':
  Import translations. DO NOT MERGE


Trivial merge