OSDN Git Service

am cf0a7630: am b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Mon, 6 Feb 2012 20:54:37 +0000 (12:54 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Feb 2012 20:54:37 +0000 (12:54 -0800)
commitf8152a6c8f144d0718842a3fbe2bc872d957cc65
treea1bb74870baf326b595abde7baae8beb67d1a086
parent376728c2378df941e5bef4b1def484569f270410
parentcf0a7630c5aa2f8715133f8d0cbfca1a334077d0
am cf0a7630: am b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE

* commit 'cf0a7630c5aa2f8715133f8d0cbfca1a334077d0':
  Import translations. DO NOT MERGE