OSDN Git Service

am 15ebeec4: am f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 3 Feb 2012 23:09:41 +0000 (15:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Feb 2012 23:09:41 +0000 (15:09 -0800)
* commit '15ebeec4f2a72e88701e5f4586e350edc8f1c58f':
  Import translations. DO NOT MERGE


Trivial merge