OSDN Git Service

am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location"
authorGlenn Kasten <gkasten@android.com>
Fri, 16 Mar 2012 17:01:28 +0000 (10:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Mar 2012 17:01:28 +0000 (10:01 -0700)
* commit 'd8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
  Add empty libmedia_native in old location


Trivial merge