OSDN Git Service

am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Thu, 20 Feb 2014 18:03:07 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Feb 2014 18:03:07 +0000 (18:03 +0000)
commit5da96060e61c3076d0a5cbd87a3f17254414afeb
tree1c7669753ee3355ffc7a699a225cf5afda97794c
parent8b297fb6ef42650a1126287aa0b610aa9a503167
parentf887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef
am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'f887a67dbd1fd22c16cadc58b8f23bfd4eeba4ef':
  Import translations. DO NOT MERGE