| commit | 4be5b92e555a7162d4511845ff10e834a02bf09d | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jul 04 10:53:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 04 10:53:23 2014 +0000 |
| tree | 5b836320bca506bb3d39b1a55c30c9029ac2cc2a | |
| parent | 1359908de6e5296aea17f85dacaa70a01a9aab62 [diff] | |
| parent | 2d067babdb9ff124f18797c5b44222379fe95fd9 [diff] |
am 2d067bab: (-s ours) am 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" * commit '2d067babdb9ff124f18797c5b44222379fe95fd9': fix AudioTrack and AudioRecord JNI