OSDN Git Service

am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 18 Nov 2013 18:56:17 +0000 (10:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Nov 2013 18:56:17 +0000 (10:56 -0800)
commit0076f4ac0f35814fed1613cae1120b3d954fe985
tree7d846b53aaa51be4d2d815c15f3dfd4e0a062b46
parent51213d943b3931434cbd196a8a159ee325a4e3fc
parent2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5
am 2cf27e71: (-s ours) am d7b40520: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2cf27e711196c3c8fdf8ed14e283bd6a08b7fde5':
  Import translations. DO NOT MERGE