OSDN Git Service

am 15ebeec4: am f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Fri, 3 Feb 2012 23:09:41 +0000 (15:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 3 Feb 2012 23:09:41 +0000 (15:09 -0800)
commit13f9568589649b7bb23a7c62bc0b173fd6a4c587
treee65365b6bcc45a423ee246874ec039a910499638
parent53de8a606c4eb57519396428a6f8f5ad53f584cb
parent15ebeec4f2a72e88701e5f4586e350edc8f1c58f
am 15ebeec4: am f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE

* commit '15ebeec4f2a72e88701e5f4586e350edc8f1c58f':
  Import translations. DO NOT MERGE