OSDN Git Service

am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c...
authorGeoff Mendal <mendal@google.com>
Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)
commit1c95645b3bbc55db50d5720e29a2b867d849d0f8
tree7c393e532652b1cf4d5372e9073dbea6fb38c01c
parent6d85d1686e6a333fe990d9e3ae5b978e8a8ce8c2
parentca059bfb439df9db2c4ee2f7d860e8a29bf0a91f
am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d  -s ours

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