| commit | b1ed19a2ed1739c0d415cc81a3b7c458307694ab | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Feb 11 16:40:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 11 16:40:35 2014 +0000 |
| tree | 2054a45c7beb084011dcdba3a73eb8fa1d965334 | |
| parent | 7f258f970e2123131638665c9d6674a7e1c7e4ea [diff] | |
| parent | 43c9516a29563131e04ee797562130e2c4f9d54e [diff] |
am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" * commit '43c9516a29563131e04ee797562130e2c4f9d54e': Fix in MediaMuxer's JNI code