OSDN Git Service

am 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Tue, 8 May 2012 18:32:18 +0000 (11:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 May 2012 18:32:18 +0000 (11:32 -0700)
commit410f99bf48cdfa403bb2a3351a1a22bd9ddb5141
tree262c43e2194d709e68adbcd37dd3e53ddc351738
parent81c2f0115a81446ed51a5ed86b4eaaa2e1de2050
parent67ef88e7f29283e2dce92f7267d3f07e169408b6
am 67ef88e7: (-s ours) am dc0e7625: Import translations. DO NOT MERGE

* commit '67ef88e7f29283e2dce92f7267d3f07e169408b6':
  Import translations. DO NOT MERGE