OSDN Git Service

am 5cd229b3: (-s ours) am 00af9fc9: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 15 May 2012 02:41:23 +0000 (19:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 May 2012 02:41:23 +0000 (19:41 -0700)
commit48243334070e66872daeb667f4697ccd6c1020fb
treedacb7935247cde9c06c91c6b557c11183f5f27ee
parent5ac531134bf4e23ac136282ba36b2a88d485af02
parent5cd229b367037fded6eae9fa3a328a9ab4f52508
am 5cd229b3: (-s ours) am 00af9fc9: Import translations. DO NOT MERGE

* commit '5cd229b367037fded6eae9fa3a328a9ab4f52508':
  Import translations. DO NOT MERGE