OSDN Git Service

am c2bc46ea: (-s ours) am 4e1e57fd: am a64072a4: Merge "Import translations. DO NOT...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:15:37 +0000 (10:15 -0800)
* commit 'c2bc46ea31e7ec145f11ba7a7d5f5891ad0c50ac':
  Import translations. DO NOT MERGE


Trivial merge