OSDN Git Service

am fbfe22e6: (-s ours) am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222...
authorGeoff Mendal <mendal@google.com>
Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:59 +0000 (18:14 +0000)
commita3ce81dc0485564b9fceaf433bce7969efde1679
tree3804e07840427a842ef1bdc750bffe2239123c26
parent8efd49638cb6c84ba4b8842715d4ea7b3423dd2f
parentfbfe22e611be62d062dca552cb7262e0157d76a1
am fbfe22e6: (-s ours) am a08365d6: (-s ours) am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

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