OSDN Git Service

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


Trivial merge