OSDN Git Service

am 212962d0: (-s ours) am a532005c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 27 Aug 2015 11:18:57 +0000 (11:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:18:57 +0000 (11:18 +0000)
* commit '212962d0e187ac02d7fd6b7bd7c49efea8b78235':


Trivial merge