OSDN Git Service

am 738e8bbc: (-s ours) am 070e7bf9: (-s ours) am c683cef2: (-s ours) am a2aab1aa...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 17:40:46 +0000 (17:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 17:40:46 +0000 (17:40 +0000)
* commit '738e8bbcefc1060cf9771576f77e7714bc9c17d2':
  Import translations. DO NOT MERGE


Trivial merge