am 05d3b189: am 11f8d20b: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"
* commit '05d3b18900ec23577b665ac9a4d565287e866811':
This commit is contained in: