tree b817134f0316bc0ba447856a60d3ef86d82869f4
parent 6c8cafac168e2cc2425a944717082ebe68795df7
parent 8cebf1ff7836a5dc365e49f7a14d7546a651d9c7
author Jean-Baptiste Queru <jbq@google.com> 1248566302 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1248566302 -0700

Merge korg/donut into korg/master

Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java