OSDN Git Service

am ecd9c570: (-s ours) am 78ef5443: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 10 Feb 2012 18:16:08 +0000 (10:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:16:08 +0000 (10:16 -0800)
* commit 'ecd9c570f767040e8c021aa6ed995894c0d8d754':
  Import translations. DO NOT MERGE


Trivial merge