OSDN Git Service

am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 25 Nov 2013 21:07:16 +0000 (13:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 25 Nov 2013 21:07:16 +0000 (13:07 -0800)
commitb88897d758596209047bc525ff10ef06386eacbb
treec5ce28425fbc230e86b6c294474d8055bba15e77
parentde315ef32fe0f7bf66d99c7ecf5bf63a122989cb
parent7b1d7e46f9429a7bb82142da461223016361224c
am 7b1d7e46: (-s ours) am 7191c955: (-s ours) Import translations. DO NOT MERGE

* commit '7b1d7e46f9429a7bb82142da461223016361224c':
  Import translations. DO NOT MERGE