Merge "Integrating RandomMusicPlayer sample into tree." into honeycomb-mr2

author Bruno Oliveira <btco@google.com>

Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)
author Bruno Oliveira <btco@google.com>
Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)
diff --cc Android.mk
Simple merge
diff --cc docs/html/resources/resources-data.js
Simple merge
author	Bruno Oliveira <btco@google.com>
	Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 21 Jun 2011 18:07:47 +0000 (11:07 -0700)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
docs/html/resources/resources-data.js	patch \|	diff1 \|	diff2 \|	blob \| history