OSDN Git Service

am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into...
authorJustin Ho <justinho@google.com>
Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Feb 2012 18:13:19 +0000 (10:13 -0800)
* commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
  Import translations. DO NOT MERGE


Trivial merge