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)
* commit '040cfe56112326d470a58b2f55642a234ff3fce2':
  Import translations. DO NOT MERGE


Trivial merge