OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 05abe8d 6233543)
am 62335430: Merge change I4499ad72 into eclair
authorEric Olsen <eolsen@android.com>
Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 01:36:59 +0000 (17:36 -0800)
Merge commit '62335430b05d92ad2255bf20b76b35e012b385c9' into eclair-mr2

* commit '62335430b05d92ad2255bf20b76b35e012b385c9':
  Fix bad merge fixes build breakage.


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