OSDN Git Service

am cf38f8a7: (-s ours) am 04312d09: (-s ours) am 15579b8d: (-s ours) am 4e3575eb...
authorGeoff Mendal <mendal@google.com>
Tue, 14 Jul 2015 22:05:51 +0000 (22:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jul 2015 22:05:51 +0000 (22:05 +0000)
* commit 'cf38f8a7b5d9784276f5a7e9c3d047651ddde624':
  Import translations. DO NOT MERGE


Trivial merge