| commit | 2f485f29e823e418ec160416ff425e8a015cae80 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Thu May 15 11:11:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 15 11:11:10 2014 +0000 |
| tree | 5922c3afca912e375b48e0fbb9c5f00183f57170 | |
| parent | 89e88769f62b7ad4bea3facfb3620f469c50ddfc [diff] | |
| parent | 3dc9183a69bb05aaa719c15e5ffecefbe92d3f1f [diff] |
am 3dc9183a: am 2ec7a5c0: am a5afedd2: Merge "Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build" * commit '3dc9183a69bb05aaa719c15e5ffecefbe92d3f1f': Fixes samples Teapot/MoreTeapots armeabi-v7a-hard; native-audio debug build