summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
|\
| * Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
|/
* Merge "libstagefright: use __predict_false from bionic rather than CONDITION ...Mark Salyzyn2014-11-121-1/+1
|\
| * libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
|/
* Merge "Move to libc++."Dan Albert2014-11-113-23/+3
|\
| * Move to libc++.Dan Albert2014-11-113-23/+3
|/
* Merge "Camera: Guard against asBinder() calls on NULL interfaces"Eino-Ville Talvala2014-11-107-17/+27
|\
| * Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-077-17/+27
* | Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ | |/ |/|
| * Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
|/
* Resolve conflictThe Android Open Source Project2014-11-06864-122269/+75117
|\
| * am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\
| * \ am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
| |\ \
| | * | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| * | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ | | |/ /
| | * | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
| * | | am ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
| |\ \ \ | | |/ /
| | * | Fix the fixMarco Nelissen2014-10-201-1/+3
| * | | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| |\ \ \ | | |/ /
| | * | Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| | |\ \
| | | * | Clear effect buffer before sending to chainMarco Nelissen2014-10-171-4/+3
| * | | | am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring trac...Andy Hung2014-10-171-1/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-devAndy Hung2014-10-171-1/+4
| | |\ \ \
| | | * | | Fix AudioTrack retrograde getPosition when restoring tracksAndy Hung2014-10-171-1/+4
| * | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| | |\ \ \ \
| | | * | | | move audio sink open/close to NuPlayerRendererChong Zhang2014-10-164-123/+223
| | | |/ / /
| * | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \ \ \
| | * \ \ \ \ am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| | |\ \ \ \ \
| * | \ \ \ \ \ am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
| | | | |_|_|/ / | | | |/| | | |
| * | | | | | | am 4b21635d: am b6dcdbf4: (-s ours) Revert "audio: prevent larger than requir...Chris Elliott2014-10-160-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am b6dcdbf4: (-s ours) Revert "audio: prevent larger than required sleeps - D...Chris Elliott2014-10-160-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-161-21/+1
| * | | | | | | | am a2d4a6da: audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-161-0/+20
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | audio policy: Fix for voice call audio lossHaynes Mathew George2014-10-151-0/+20
| * | | | | | | | am 05c0d7d7: am 620208dc: (-s ours) audio: prevent larger than required sleep...Chris Elliott2014-10-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 620208dc: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-150-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-151-1/+21
| * | | | | | | | am 54599682: am 2feb18dd: (-s ours) Revert "audio: prevent larger than requir...Chris Elliott2014-10-150-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 2feb18dd: (-s ours) Revert "audio: prevent larger than required sleeps - D...Chris Elliott2014-10-150-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-151-21/+1
| * | | | | | | am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_st...Zhijun He2014-10-141-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" ...Zhijun He2014-10-141-0/+4
| | |\ \ \ \ \ \
| | | * | | | | | Camera2Client: avoid two consecutive sets of configure_streams callsZhijun He2014-10-141-0/+4
| * | | | | | | | am 95740336: am 8c0417c1: (-s ours) audio: prevent larger than required sleep...Haynes Mathew George2014-10-140-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 8c0417c1: (-s ours) audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-140-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-141-1/+21
| * | | | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
generated by cgit v1.1 at 2024-05-29 09:48:06 +0000