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


Trivial merge