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)
* commit '67ef88e7f29283e2dce92f7267d3f07e169408b6':
  Import translations. DO NOT MERGE


Trivial merge