OSDN Git Service

Tracking merge of dalvik-dev to gingerbread
authorBrian Carlstrom <bdc@google.com>
Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)
committerBrian Carlstrom <bdc@google.com>
Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)
commit7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0
treecad1e461cc21b7238204dd3f6bee588150ed14e5
parente1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4
Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
core/java.mk
core/tasks/cts.mk
tools/droiddoc/src/Stubs.java