GitHub PushEvent at 2014-01-21 04:04:02
Repository: android_frameworks_base
Actor: cj360
Payload: {"shas":[["edc1f77ae1e3a91294b7793439669195fe3a2aaa","63ef95e46407a506ccab6c0305b747485854f08f@codeaurora.org","audio: add support for MSM audio formats\n\n- Add support for EVRC, QCELP, and WMA formats\n- Add definition for 5.1 channel recording\n- Reference change If3676b88fa287b484ef8616c0a6b67177b61a720\n\nChange-Id: I6b6e5ca98921adeadd2a3d76580fe85fb28eeaf0\n(cherry picked from commit 10c4f204bb5ac78b9cf3854b536663ccd3d50333)\n(cherry picked from commit 3f99cc5f134b0f00a52218ae1c0273cc11ae7702)\n(cherry picked from commit 1d35b52c7c9cf1cfd3a3de372391a7a57f593af9)\n\nConflicts:\n\n\tcore/jni/android_media_AudioRecord.cpp\n\tcore/jni/android_media_AudioTrack.cpp\n\tmedia/java/android/media/AudioFormat.java\n\tmedia/java/android/media/AudioRecord.java\n\tmedia/java/android/media/AudioTrack.java\n\tmedia/java/android/media/MediaFile.java\n\tmedia/java/android/media/MediaRecorder.java","Sharad Sangle",true],["f5a718faac477691155096b16dbb42a5bc5c2140","83fb1357418b41ceafdb592a039594a22b237a30@codeaurora.org","  audio: Support for MSM audio formats\n\n  -Add audio format support for Voip.\n\nChange-Id: Ie045ba926b3e1266afd3fb6fba09af3a55daaeef\n(cherry picked from commit d1810964ecd2d50064a1fed51049ddc354b9a788)\n(cherry picked from commit cd9c6dc56bedcabca77c2a01c6fb15f4d2e8edd5)\n(cherry picked from commit 01c09aeae38716860ef1a806985cc946dca93f60)\n\nConflicts:\n\n\tcore/jni/android_media_AudioRecord.cpp\n\tcore/jni/android_media_AudioTrack.cpp","Venkata Narendra Kumar Gutta",true],["1d939697c5fcee4a4175cf886c70bb96035f3c5b","bc6501c174fe21162c67cfc51ecb38b9a4d035f0@gmail.com","audio: Add ifdefs for QCOM_HARDWARE audio features\n\nChange-Id: I0ea423f9a28934dc1fee73bbb53c0d9d867877ff","Ethan Chen",true]],"size":3,"ref":"refs/heads/remix-legacy","head":"1d939697c5fcee4a4175cf886c70bb96035f3c5b"}