OSDN Git Service

am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 13 Jul 2015 15:32:06 +0000 (15:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Jul 2015 15:32:06 +0000 (15:32 +0000)
commit05ffc7265bfca0810d03177d61f7c1bb6bd39ecb
treef951c975eb2392551ddc0eecc2212fd7b65d1df0
parent322e1f57def9c86e735a94e8a92b6310655a6c33
parent913cd0086cec15e05b2b64f9a3e14448b0c53df2
am 913cd008: (-s ours) am fd7a7dc8: (-s ours) Import translations. DO NOT MERGE

* commit '913cd0086cec15e05b2b64f9a3e14448b0c53df2':
  Import translations. DO NOT MERGE