tree c315695f8af7b8fcd9f4f1d36d544ba170a20ee8
parent 7de8c849d7241b0e9faa34f576f7beb296f57d5c
parent 60b62bc5c11c0bfcdf84ca8f5b2053e5747f86bc
author Eric Laurent <elaurent@google.com> 1402002290 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402002290 +0000

Merge "add sound trigger JNI"