OSDN Git Service

am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2...
authorGeoff Mendal <mendal@google.com>
Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 12:57:33 +0000 (12:57 +0000)
commit0929be6613afbf01c313e94f019a0a3d30c9a0a4
tree7501da73d6c325513cf56566749cb0dda39437da
parentafc3831267c426974119608bb6c9179223532e47
parentdffcc532693c4bc6e07cf05ac532148612a94176
am dffcc532: (-s ours) am c7b0a816: (-s ours) am 49b491bb: (-s ours) am 2e095fa2: (-s ours) Import translations. DO NOT MERGE

* commit 'dffcc532693c4bc6e07cf05ac532148612a94176':
  Import translations. DO NOT MERGE