OSDN Git Service

am 11c54616: am e273289c: (-s ours) Merge change Ic0ce5c9a into eclair
authorEric Fischer <enf@google.com>
Fri, 11 Dec 2009 01:49:43 +0000 (17:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:49:43 +0000 (17:49 -0800)
commitc3ce286b5cd1bb4faf3c1e3f804c6b27afd23fd3
treecd80a01e40f105fdd32ca145ea15fd1eef2f4645
parentae03d202c65de85270a20900e1e80608692b815f
parent11c546162a489be5cc3a698e5c9f0bc4d3e65cab
am 11c54616: am e273289c: (-s ours) Merge change Ic0ce5c9a into eclair

Merge commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab' into eclair-mr2-plus-aosp

* commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab':
  Import revised translations.  DO NOT MERGE