OSDN Git Service

am fefb0259: (-s ours) am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 21 May 2015 14:28:44 +0000 (14:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 14:28:44 +0000 (14:28 +0000)
commitfaaa286e4544fc75b71b4127c698b47c9c2b0e7a
treef108fa54fe5da5be287c8cbaae20fa082b25529d
parent597f056f04a3d40027cef65edb5a5cfd6138c436
parentfefb025973e2bffcbeb02666339fb7797513d82e
am fefb0259: (-s ours) am 7ca4f1a4: (-s ours) Import translations. DO NOT MERGE

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