OSDN Git Service

am 601a18b3: (-s ours) am cde8d176: Merge "Import translations. DO NOT MERGE" into...
authorEric Fischer <enf@google.com>
Tue, 29 May 2012 19:09:23 +0000 (12:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 May 2012 19:09:23 +0000 (12:09 -0700)
* commit '601a18b3d77a95e37585d051d8de2802bf3c84a4':
  Import translations. DO NOT MERGE


Trivial merge