OSDN Git Service

am 78492fe7: am 338259f2: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 22:25:53 +0000 (14:25 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 22:25:53 +0000 (14:25 -0800)
commite978fed2db93d98fce576dc873afd53e6469b595
treebf142a0ba24a23135de5c71b3efead5868ae26b5
parent4ea5d83539da6ab77a56415f69e9d5dbe205766a
parent78492fe70c43432a0f1c2d88bc9133d2708f51fc
am 78492fe7: am 338259f2: reconcile main tree with open-source eclair

Merge commit '78492fe70c43432a0f1c2d88bc9133d2708f51fc'

* commit '78492fe70c43432a0f1c2d88bc9133d2708f51fc':
  android-2.1_r1 snapshot