OSDN Git Service

am c02bfe5e: merge from open-source master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 15 Nov 2009 23:01:13 +0000 (15:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 15 Nov 2009 23:01:13 +0000 (15:01 -0800)
Merge commit 'c02bfe5e77b84b82f3830f00554be5e735486850'

* commit 'c02bfe5e77b84b82f3830f00554be5e735486850':
  eclair snapshot
  Part 2 of 2 for merge of ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue
  Part 1 of 2 for merge of ec59a8834bbca256495045a6687a672f66b52df0 to workaround a git issue


Trivial merge