Merge "Switched to use the header files in /frameworks/native and deleted the duplica...

author James Dong <jdong@google.com>

Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)

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

Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)
author James Dong <jdong@google.com>
Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)
diff --cc media/libmedia/MediaProfiles.cpp
Simple merge
author	James Dong <jdong@google.com>
	Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)