OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d4fcc7 3fb5c80)
am 50a3977c: Merge "Adding BusinessCard sample to Android.mk and to the Resources...
authorTrevor Johns <trevorjohns@google.com>
Mon, 11 Jan 2010 22:05:55 +0000 (14:05 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jan 2010 22:05:55 +0000 (14:05 -0800)
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp

* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
  Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help