tree 9d04e9333cb1c42daf13b3bb5ed54f555371667f
parent 359ec8887989dd71350313e3d01406b6f0ceef00
parent 45499a4402cca08d2b9b427d0f3364d7f25dff08
author Andrew Hsieh <andrewhsieh@google.com> 1333381066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333381066 -0700

am 45499a44: am e3f5656b: am 48aaee2c: Merge "Native media sample app for NDK API level 14"

* commit '45499a4402cca08d2b9b427d0f3364d7f25dff08':
  Native media sample app for NDK API level 14