am 1b831d75: (-s ours) am 4c1acb60: Merge "Import revised translations DO NOT MERGE...
authorKenny Root <kroot@google.com>
Mon, 18 Oct 2010 17:31:03 +0000 (10:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 18 Oct 2010 17:31:03 +0000 (10:31 -0700)
commitc2c87a02f42b8a9b4f419df72617c0c1ab6d5756
tree9ca2034a96861dd94a76a801c3aa5b518bf7a8c3
parentd1140df2630b5a262efa1cbf4cb3361d0dd56aa8
parent1b831d75cec0f75f4bdbaac2a77053da93d5cb2d
am 1b831d75: (-s ours) am 4c1acb60: Merge "Import revised translations DO NOT MERGE" into gingerbread

Merge commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d'

* commit '1b831d75cec0f75f4bdbaac2a77053da93d5cb2d':
  Import revised translations DO NOT MERGE