OSDN Git Service

am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Mar 2015 13:47:20 +0000 (13:47 +0000)
commita07520f6888981f4e310aa3c3c49ff6ea04b51d0
tree2d712ab1ceef514d9fe172f8bac42e2756ac29a2
parentb4ee938f74fdf6ffe3cad237342d7f5034a55053
parentba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5
am ba5c9ed1: (-s ours) Import translations. DO NOT MERGE

* commit 'ba5c9ed1835cb3eef7dcf6e2968be1b0e5316dc5':
  Import translations. DO NOT MERGE