OSDN Git Service

am be5918ba: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:19:15 +0000 (11:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:19:15 +0000 (11:19 +0000)
commit7238eefa4b2a225e7fe98a85442993da79b6b3f1
tree3c0461c5c282480975dc6250f9835ccdde1adbea
parent7be68b1d4e5ece03dacc6374f6cc84320bab700a
parentbe5918ba8ef7c32692d2ce4e12df5a72b557e74d
am be5918ba: (-s ours) am a95faf78: (-s ours) Import translations. DO NOT MERGE

* commit 'be5918ba8ef7c32692d2ce4e12df5a72b557e74d':