OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6a85a2 38137d7)
am 38137d7a: Merge "docs: lots of additions to the resources docs new drawable resour...
authorScott Main <smain@google.com>
Thu, 15 Jul 2010 18:20:32 +0000 (11:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 15 Jul 2010 18:20:32 +0000 (11:20 -0700)
Merge commit '38137d7a27b037611c70a9d900aa53b4c15563bf' into gingerbread

* commit '38137d7a27b037611c70a9d900aa53b4c15563bf':
  docs: lots of additions to the resources docs

1  2 
core/java/android/view/View.java patch | diff1 | diff2 | blob | history

diff --cc core/java/android/view/View.java
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help