tree 17179b49680f4c242c80ecd1dc9887fcab6ecbdb
parent fdac94af1d925a983f63aa50d50f1e1559844928
parent 78b5e82f421bfdf5c1c72bd0ca2fb7f3bc1a45ff
author Glenn Kasten <gkasten@google.com> 1332536760 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332536760 -0700

Merge "Revert "Split libmedia into libmedia and libmedia_native""