OSDN Git Service

am 0929be66: (-s ours) am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb...
authorGeoff Mendal <mendal@google.com>
Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 13:02:08 +0000 (13:02 +0000)
* commit '0929be6613afbf01c313e94f019a0a3d30c9a0a4':
  Import translations. DO NOT MERGE


Trivial merge