OSDN Git Service

resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as...
authorandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>
Wed, 12 Aug 2009 19:01:35 +0000 (12:01 -0700)
committerandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>
Wed, 12 Aug 2009 19:01:35 +0000 (12:01 -0700)
commit45e503ae91d380ebe5158927b7d6aa80e166d096
tree6c0b3411d101ad0d5b4518ebf4e313a7d7686dec
parent4547962a95359f1d390b9cbb7459789391e86089
parent802527c6a8a91f7da72f2ce9f6cb3cc342582127
resolved conflicts for merge of 802527c6 to master skipping preloaded-classes as pre Bob
core/java/com/android/internal/os/ZygoteInit.java