OSDN Git Service

am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 22:45:37 +0000 (22:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 22:45:37 +0000 (22:45 +0000)
commit80e9c04e910f88283f34dddac36f32db291e9c63
treea4a82ef6ad1d4f9642c396b346b156449805dfcf
parent69032a7a237f58a4b7f8f273cbce8cd25285b84b
parentf48b416e9806f374f95cfcfc35b60db82bb272a8
am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
  Import translations. DO NOT MERGE