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