tree bf52f9c2c309f28b429c364485a1d66279681fbc
parent b360b2e8c19a4a341f9d54c573ec514330ec5958
parent 2ec7a5c0f679a0d1e83ebc55479d1b8bbcb79f7d
author Andrew Hsieh <andrewhsieh@google.com> 1400152046 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400152046 +0000

am 2ec7a5c0: am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build"

* commit '2ec7a5c0f679a0d1e83ebc55479d1b8bbcb79f7d':
  Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build