OSDN Git Service

am e82dcd32: (-s ours) am 80e9c04e: (-s ours) am f48b416e: (-s ours) am a5516e80...
authorGeoff Mendal <mendal@google.com>
Wed, 15 Jul 2015 23:18:01 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 23:18:01 +0000 (23:18 +0000)
* commit 'e82dcd329f186637a7fd23d11a0e123612ee6d4a':
  Import translations. DO NOT MERGE


Trivial merge