OSDN Git Service

am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE
authorGeoff Mendal <mendal@google.com>
Sat, 30 May 2015 16:44:02 +0000 (16:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 30 May 2015 16:44:02 +0000 (16:44 +0000)
commit3758bfb4283bb90a0f1bc99d5c1cce6707a4a652
tree05d79a922cc06f42da7ecd019bd0f3d807a5a859
parentb434a10033a8a2386693b589ecff094adfdddeb7
parentee1910d4d1fc3a73f10bc72c2233f10744499e15
am ee1910d4: (-s ours) am 818a2ecc: (-s ours) Import translations. DO NOT MERGE

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