OSDN Git Service

am b1fcdd60: (-s ours) am 36166474: Merge "Import translations. DO NOT MERGE"
authorYing Wang <wangying@google.com>
Thu, 26 Jul 2012 15:15:17 +0000 (08:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 15:15:17 +0000 (08:15 -0700)
* commit 'b1fcdd606d63fa43dc6a0aeeca13e3784cfcbb6f':


Trivial merge