OSDN Git Service

(root) / android-x86 / development.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41430b9 0aa3856)
resolved conflicts for merge of 0aa38562 to master
authorRaphael <raphael@google.com>
Tue, 23 Nov 2010 10:57:16 +0000 (02:57 -0800)
committerRaphael <raphael@google.com>
Tue, 23 Nov 2010 10:57:16 +0000 (02:57 -0800)
commitba068ce3567ed190d1248eec3c6605c0975330c0
tree574089cd8a7a6a1851090c18bd69cc390f2f1a96tree | snapshot
parent41430b9f30092cbd640105e0dd13f656685a750bcommit | diff
parent0aa3856227eb3b9f63419b6e91ac80f25f0dc104commit | diff
resolved conflicts for merge of 0aa38562 to master

Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a
samples/NotePad/AndroidManifest.xml diff1 | diff2 | blob | history
development
About OSDN
Find Software
Develop Software
Help