OSDN Git Service

am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:54:38 +0000 (20:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:54:38 +0000 (20:54 +0000)
commitcd0f6e0cd5ab3271897064b28cecc50c0a481ca8
treeb9221af250cffb377475a64263ff9a9a5f4379e1
parent0d7ed5fc5f524e966dcc9060ea7b4eff0e57469c
parent6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959
am 6fc0c669: (-s ours) am 33cd5b9e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-kermit

* commit '6fc0c6690ed00dbc7b3dd1a6a4dd0ce8b7dc8959':
  Import translations. DO NOT MERGE