OSDN Git Service

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


Trivial merge