OSDN Git Service

am 548614a4: (-s ours) am c3bd6087: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Thu, 21 Nov 2013 22:10:26 +0000 (14:10 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Nov 2013 22:10:26 +0000 (14:10 -0800)
* commit '548614a4e6e0571d5cf06eb5514d0db8fc017d0b':
  Import translations. DO NOT MERGE


Trivial merge