OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17fd21f 5a72672)
resolved conflicts for merge of 5a726729 to gingerbread
authorScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
committerScott Main <smain@google.com>
Wed, 10 Nov 2010 22:46:44 +0000 (14:46 -0800)
commit77f5c9542e159cb9f2f2908227212d4add8ce74c
tree06d9be556d5dc79d074232c7ae346c7e874f25f8tree | snapshot
parent17fd21fc0638d8734867b6f189efbabb227f3ae1commit | diff
parent5a72672977b2682ee93160124d8fae9d64c16fe8commit | diff
resolved conflicts for merge of 5a726729 to gingerbread

Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
docs/html/resources/resources_toc.cs diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help