| commit | 04c72e304c7c79b77eed61a6aa605526cf14ecca | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Sep 04 11:14:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 04 11:14:42 2014 +0000 |
| tree | be8e3112aa3d649cba101c06e47ee3569cc31430 | |
| parent | ad0a66acf4a28646bd1a0060736cdb8e7d9712a4 [diff] | |
| parent | be76be83b188bb4cbcd3bc9bd6398af4d444ecb0 [diff] |
am be76be83: Merge "android_media_MediaMuxer_setLocation: amended signature." * commit 'be76be83b188bb4cbcd3bc9bd6398af4d444ecb0': android_media_MediaMuxer_setLocation: amended signature.