tree 631f292f06f13d22620bfd68f94ab1e55b717cf4
parent 09ac46eeed387ecb893f072e7630b8bc390f8343
parent 2f5539a4eb682e0ad9b44641f5d98af0d97fed9a
author Andrew Hsieh <andrewhsieh@google.com> 1414266821 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414266821 +0000

am 2f5539a4: am 7a042ce4: am 9376f14e: Merge "Change sample native-codec\'s minSDK to android-21"

* commit '2f5539a4eb682e0ad9b44641f5d98af0d97fed9a':