tree 85fbf84faee0d164617d2eab10e2f9c805271cf0
parent f88cea6ded2023bd7b3330640f28cc730599e934
parent 6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c
author Jean-Baptiste Queru <jbq@google.com> 1258326059 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258326059 -0800

am 6e5be9b2: merge from open-source master

Merge commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c'

* commit '6e5be9b24c232be4cfc22b7cbabb0fdf6d869f7c':
  eclair snapshot