OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce7c05e 42f1819)
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp
authorScott Main <smain@google.com>
Thu, 10 Feb 2011 21:47:32 +0000 (13:47 -0800)
committerScott Main <smain@google.com>
Thu, 10 Feb 2011 21:47:32 +0000 (13:47 -0800)
commitc06e7abe6f37d1d8bc4f1c228964229d9f101d70
treed47e7ab71ae711e1e1dc28dabbbff19a9853d00ftree | snapshot
parentce7c05e842d4e35ce180d398ecb969aad18f3460commit | diff
parent42f18194974f6db9ca32f5b4229fb219198dabddcommit | diff
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp

Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7
docs/html/guide/guide_toc.cs diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help