tree 9b75029e21bda1650f229bbbf582c68142a0dada
parent c98c8831388d206f3883767fda3e9c0e5b2e816b
parent 2ae5a73d4994bd294ee17b8bfb8d722ef9a2564a
author Glenn Kasten <gkasten@android.com> 1331874578 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331874578 -0700

am 42c6d163: Merge "Add empty libmedia_native in old location"

* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location