OSDN Git Service

am f6688d1e: (-s ours) am ceab9f07: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 25 May 2012 18:35:46 +0000 (11:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 May 2012 18:35:46 +0000 (11:35 -0700)
commit28968bdc0a1deadb3877b44094bd0cf0b995e0f9
tree7c5b0dcf70fc1719de4b086fa2df024c54964412
parent16767eb1e6b1f42338efdd7fa49c28691a380bee
parentf6688d1e099d79ff288dc14ee94e7ad2bcf1c470
am f6688d1e: (-s ours) am ceab9f07: Import translations. DO NOT MERGE

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