tree b3446119a9b6c03dcca98d1d9ee31a83adb8acad
parent c524ffda17017d8467a237a1eddfd7e7c03c6617
author Glenn Kasten <gkasten@google.com> 1332536752 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332536752 -0700

Revert "Split libmedia into libmedia and libmedia_native"

This reverts commit 0a3edd38df0743dcc7091bb7ebf29e7e7dadc7cb