OSDN Git Service

am 543e96aa: am 3289d8fe: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:15:06 +0000 (14:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:15:06 +0000 (14:15 -0800)
Merge commit '543e96aa39ab408aaaf83a2de364a01ca07f3689'

* commit '543e96aa39ab408aaaf83a2de364a01ca07f3689':
  android-2.1_r1 snapshot


Trivial merge