OSDN Git Service

am b239f1fd: am 5116f2fd: am a4e538e0: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Wed, 24 Oct 2012 16:49:25 +0000 (09:49 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Oct 2012 16:49:25 +0000 (09:49 -0700)
* commit 'b239f1fd7234c00f83a4f5b034a2c095f743a78a':
  Import translations. DO NOT MERGE


Trivial merge