OSDN Git Service

am a7f85762: reconcile main tree with open-source eclair
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 16:45:53 +0000 (08:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Feb 2010 16:45:53 +0000 (08:45 -0800)
commitea0f3e9deb05f2a77a616428db0d65d4579d013d
tree8f576167547291fdea94bea27bd265aafd608db3
parent6f024607366221de07121a6f7a83471d72f225b8
parenta7f85762cded62465c5144679ba8bf5b9986d0c0
am a7f85762: reconcile main tree with open-source eclair

Merge commit 'a7f85762cded62465c5144679ba8bf5b9986d0c0' into eclair-plus-aosp

* commit 'a7f85762cded62465c5144679ba8bf5b9986d0c0':
  Add uses-feature to the manifest.
  android-2.1_r1 snapshot