am 6d678f44: am 7086c5c4: am b240fe6d: am 2918193e: Merge "Media NDK files"

* commit '6d678f448be9d765031ebd5640253699611207b0':
This commit is contained in:
Andrew Hsieh
2015-03-22 00:32:32 +00:00
committed by Android Git Automerger

Diff Content Not Available