OSDN Git Service

am bcdea4ae: (-s ours) am 16376616: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 2 Oct 2013 16:34:42 +0000 (09:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 16:34:42 +0000 (09:34 -0700)
* commit 'bcdea4aeaac503f2d7610258e73909db4e4e6292':
  Import translations. DO NOT MERGE


Trivial merge