tree d0554127703fa8b051c552390982a4f205a63928
parent a6e8e0d8fbb38398884fd5c5cc0d42431070e031
parent 2437e141fee12b2b4328a2f86b1734e6638e5936
author Andrew Hsieh <andrewhsieh@google.com> 1413422853 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1413422853 +0000

Merge "Change sample native-codec's minSDK to android-21"