OSDN Git Service

am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Sat, 5 Oct 2013 16:37:01 +0000 (09:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 5 Oct 2013 16:37:01 +0000 (09:37 -0700)
commit2abb3443170885bc41ccfaa903796f6435b10839
tree167d642a5dc0c789ac21f92feb55ade088123635
parent5318a0d3059c65f51464c7110e34d4f5a33de7be
parent040cfe56112326d470a58b2f55642a234ff3fce2
am 040cfe56: (-s ours) am 8aecb7ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '040cfe56112326d470a58b2f55642a234ff3fce2':
  Import translations. DO NOT MERGE