OSDN Git Service

am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
authorGeoff Mendal <mendal@google.com>
Wed, 8 Jul 2015 15:50:30 +0000 (15:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Jul 2015 15:50:30 +0000 (15:50 +0000)
commit74d8ac2e274f0a19f5164191e8dd00dd8e741428
treef52701ec1ca1a7d2e2653fe4c722429731aaf4d5
parent49c7861984dfe4bf4516a5666995e3b36c0f7fd7
parent4a332ee8ed15c991e29e46490d2a9d93117bca26
am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
  Import translations. DO NOT MERGE