tree 2fe3c3d822069bb3a69635d2f07da85c301b4939
parent 37b647901798727c01a9bbc5960060ec4880a47a
parent 2918193e0b792e089a8373817f3f485a037eca2f
author Andrew Hsieh <andrewhsieh@google.com> 1405600238 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405600238 +0000

am 2918193e: Merge "Media NDK files"

* commit '2918193e0b792e089a8373817f3f485a037eca2f':
  Media NDK files