OSDN Git Service

am cfa5798d: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:08 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:08 +0000 (11:19 +0000)
commit9747f84d38fd2c76e3d15331d62a68a24434fe28
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent6a49f18dafd829d0de18030371af5e7fb47150d4
parentcfa5798d4987514337143b8ef79e4cbe5c6de9d1
am cfa5798d: (-s ours) am 0e58fb83: (-s ours) Import translations. DO NOT MERGE

* commit 'cfa5798d4987514337143b8ef79e4cbe5c6de9d1':