OSDN Git Service

am 2c95ab5e: (-s ours) am 5665cda1: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Wed, 21 Mar 2012 02:36:30 +0000 (19:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Mar 2012 02:36:30 +0000 (19:36 -0700)
commit439c551cf3e5b4401d9fa1a7f7196693172cf6a3
tree15191217d69e0b9a51340848cf4f90d57fb6fda6
parent7448daee66a9210a4c768558eb50e425f6d99d29
parent2c95ab5e48cfa5eeb31a394bd249d4eaf27493ea
am 2c95ab5e: (-s ours) am 5665cda1: Import translations. DO NOT MERGE

* commit '2c95ab5e48cfa5eeb31a394bd249d4eaf27493ea':
  Import translations. DO NOT MERGE