OSDN Git Service

am 201064ec: (-s ours) am b7a8eced: Import revised translations. DO NOT MERGE
authorEric Fischer <enf@google.com>
Thu, 17 Sep 2009 22:23:08 +0000 (15:23 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2009 22:23:08 +0000 (15:23 -0700)
commit0e21f16fc8c3037f6a6e7fbd230ff962afe6cffc
treecc997f8ee0e8de8eba52d088d87a8a9ae901c506
parentd1a56107b72b3ef62b452abcfcdf70e0e1fbe4b3
parent201064ec8bde9e90e0ee8a53b3237ea1775ba996
am 201064ec: (-s ours) am b7a8eced: Import revised translations.  DO NOT MERGE

Merge commit '201064ec8bde9e90e0ee8a53b3237ea1775ba996'

* commit '201064ec8bde9e90e0ee8a53b3237ea1775ba996':
  Import revised translations.  DO NOT MERGE