OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b99f0c7 6ef33cb)
am 6ef33cb3: docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38
authorScott Main <smain@google.com>
Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Oct 2010 22:39:24 +0000 (15:39 -0700)
Merge commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d' into gingerbread

* commit '6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d':
  docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38


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