Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb

author Santosh Madhava <smadhava@google.com>

Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)

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

Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)
author Santosh Madhava <smadhava@google.com>
Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)
diff --cc media/java/android/media/videoeditor/MediaArtistNativeHelper.java
Simple merge
author	Santosh Madhava <smadhava@google.com>
	Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 25 Jan 2011 06:33:44 +0000 (22:33 -0800)