OSDN Git Service

am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:16:10 +0000 (14:16 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:16:10 +0000 (14:16 -0800)
commit827dabd0a79f27f083c46bbea2c93c4af9061fc5
tree5da92f4786b58af392feae82228fbe1ddcc5d99a
parentfaeb50a924e219df689c16c57bb1b5ff1a095d62
parentc5908853dfd8ea68e81a17e4d57b1fdf76349373
am c5908853: am 1fb2a6cd: reconcile main tree with open-source eclair

Merge commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373'

* commit 'c5908853dfd8ea68e81a17e4d57b1fdf76349373':
  android-2.1_r1 snapshot