am 4ff417cb: merge from open-source master

Merge commit '4ff417cb390f15651e9c4195410d023b3547fc79'

* commit '4ff417cb390f15651e9c4195410d023b3547fc79':
  eclair snapshot
tree: f5693eacfc69f37081af6efec668d8b436781ef4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE