OSDN Git Service

am fd184821: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT...
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 07:54:32 +0000 (07:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:54:32 +0000 (07:54 +0000)
* commit 'fd18482111205f90118e8727021abee4f8c9c2cb':


Trivial merge