OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1851272 4deb52f)
am 4deb52f3: am 20777fae: am 584bce31: Merge change I09282f5b into eclair
authorRomain Guy <romainguy@android.com>
Thu, 5 Nov 2009 05:06:42 +0000 (21:06 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 05:06:42 +0000 (21:06 -0800)
Merge commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372'

* commit '4deb52f3c1a645ae2daa8dd31e72460ead2cd372':
  Fix the build (hopefully.)

1  2 
api/5.xml patch | diff1 | diff2 | blob | history

diff --cc api/5.xml
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help