OSDN Git Service

(root) / android-x86 / packages-wallpapers-Basic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f02460 a7f8576)
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)
Merge commit 'a7f85762cded62465c5144679ba8bf5b9986d0c0' into eclair-plus-aosp

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


Trivial merge
packages/wallpapers/Basic
About OSDN
Find Software
Develop Software
Help