OSDN Git Service

am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations. DO NOT MERGE...
authorEric Fischer <enf@google.com>
Fri, 1 Oct 2010 01:13:01 +0000 (18:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 Oct 2010 01:13:01 +0000 (18:13 -0700)
commit0b5b53e9edbfa95cec8cd42ad92cdf1ff43aeee6
tree95e451332ab3e5eb1473bd455483076d596aded5
parentab5c381222ebfb53a0a9e8f868f15233e27becd2
parentddaf8f490f8099514c2e3d0767e0838440f3fd1c
am ddaf8f49: (-s ours) am f20931bc: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c'

* commit 'ddaf8f490f8099514c2e3d0767e0838440f3fd1c':
  Import revised translations.  DO NOT MERGE