tree f5693eacfc69f37081af6efec668d8b436781ef4
parent d07fcc1b14258b3beea81b8c41c37c229e79f3b1
parent 4ff417cb390f15651e9c4195410d023b3547fc79
author Jean-Baptiste Queru <jbq@google.com> 1258326252 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258326252 -0800

am 4ff417cb: merge from open-source master

Merge commit '4ff417cb390f15651e9c4195410d023b3547fc79'

* commit '4ff417cb390f15651e9c4195410d023b3547fc79':
  eclair snapshot