tree a77c602d3fcde96c506852b625424dd7be6282bd
parent 0450c5ebb6125a1a58c4588af9ad3611bd65b1d1
parent 1616fa4a567bae928dfd28ebf1ec45cd701f27f1
author Eric Laurent <elaurent@google.com> 1276531473 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276531473 -0700

am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken

Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.