OSDN Git Service

am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)
* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
  Import translations. DO NOT MERGE


Trivial merge