| commit | 860bba68a1d65534ce6aec6ba8c0b0a736b18ccc | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Feb 11 08:30:25 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 11 08:30:25 2014 -0800 |
| tree | 54b1e5e859ffdecd47cf1d40e24317e737627667 | |
| parent | 5c770dfba2846ee173d147fd974f8e9f073c1534 [diff] | |
| parent | 7b7726b7982063034667c6a6076cc0b390ede8ce [diff] |
am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" * commit '7b7726b7982063034667c6a6076cc0b390ede8ce': Fix in MediaMuxer's JNI code