OSDN Git Service

am d46c2b12: am 4707351e: (-s ours) am 3293fee0: am dfeefe6a: Import translations...
authorEric Fischer <enf@google.com>
Fri, 10 Feb 2012 18:15:47 +0000 (10:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:15:47 +0000 (10:15 -0800)
* commit 'd46c2b121f0f544d186e0ecd55a2e492bbd7465f':
  Import translations. DO NOT MERGE


Trivial merge