OSDN Git Service

am 270a5503: (-s ours) am eaeb8b61: Import translations. DO NOT MERGE
authorYing Wang <wangying@google.com>
Fri, 27 Jul 2012 22:51:10 +0000 (15:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 27 Jul 2012 22:51:10 +0000 (15:51 -0700)
* commit '270a55034107d16dc993b61871314a306cb03439':
  Import translations. DO NOT MERGE


Trivial merge