OSDN Git Service

am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Mon, 3 Nov 2014 18:39:41 +0000 (18:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 18:39:41 +0000 (18:39 +0000)
commit2e5e181d0fce89b228ce26700c1588f9c0e5e17c
treea20b433614a733014cecbee0240196e0e320ce27
parent18d026251f43715ad4afc9eec8f5cc710295256b
parentc6db3cc1b71fcab1824fc327dfec66df69bf139c
am c6db3cc1: (-s ours) am f6b60987: (-s ours) Import translations. DO NOT MERGE

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