summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mv libcpustats from frameworks/native to frameworks/avGlenn Kasten2013-06-186-0/+568
* am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\
| * am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| |\
| | * Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
* | | Merge "Speed up id3v2 unsynchronization"Marco Nelissen2013-06-171-5/+10
|\ \ \
| * | | Speed up id3v2 unsynchronizationMarco Nelissen2013-06-171-5/+10
* | | | Merge "The software avc decoder would silently drop output frames if not"Andreas Huber2013-06-172-36/+31
|\ \ \ \
| * | | | The software avc decoder would silently drop output frames if notAndreas Huber2013-06-142-36/+31
| |/ / /
* | | | am 05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-160-0/+0
| |\ \ \
| | * \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-160-0/+0
| | |\ \ \ | | | |_|/ | | |/| |
* | | | | am 0cc75491: am 26bc908b: Camera2/3: Make sure to wait for idle after still c...Eino-Ville Talvala2013-06-141-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-141-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-131-0/+6
* | | | | am e4a453d4: am 214a17fd: Camera3: Always close HAL device even in face of er...Eino-Ville Talvala2013-06-141-10/+20
|\ \ \ \ \ | |/ / / /
| * | | | am 214a17fd: Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-141-10/+20
| |\ \ \ \ | | |/ / /
| | * | | Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-131-10/+20
* | | | | am 767227fc: am 82fc2ca6: am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 82fc2ca6: am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| |\ \ \ \
| | * \ \ \ am d5018116: Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge "Fix typo."Glenn Kasten2013-06-141-1/+1
| | | |\ \ \ \
| | | | * | | | Fix typo.Masaki Muranaka2013-06-061-1/+1
* | | | | | | | Merge "AudioRecord must be used as sp<> only"Glenn Kasten2013-06-143-9/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioRecord must be used as sp<> onlyGlenn Kasten2013-06-133-9/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "camera2: accept 4-value active array size"Alex Ray2013-06-131-3/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | camera2: accept 4-value active array sizeAlex Ray2013-06-131-3/+10
* | | | | | | | am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating ...Eino-Ville Talvala2013-06-131-0/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine...Eino-Ville Talvala2013-06-131-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "Camera3: Skipping no-ops good, not updating state machine bad." into j...Eino-Ville Talvala2013-06-131-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Camera3: Skipping no-ops good, not updating state machine bad.Eino-Ville Talvala2013-06-121-0/+1
* | | | | | | | | am 4541531a: am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionall...Eino-Ville Talvala2013-06-131-12/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-m...Eino-Ville Talvala2013-06-131-12/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-devEino-Ville Talvala2013-06-131-12/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Camera2/3: Create JPEG stream unconditionally.Eino-Ville Talvala2013-06-111-12/+16
* | | | | | | | | am a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-130-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-130-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-130-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | audioflinger: fix effects on direct output threadsEric Laurent2013-06-121-7/+5
* | | | | | | | | | New control block for AudioTrack and AudioRecordGlenn Kasten2013-06-1214-1550/+2496
* | | | | | | | | | Converter now takes the desired _output_ format instead of theAndreas Huber2013-06-123-37/+30
* | | | | | | | | | am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change nativewind...Lajos Molnar2013-06-122-14/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into...Lajos Molnar2013-06-122-14/+19
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-devLajos Molnar2013-06-122-14/+19
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | stagefright: synchronously change nativewindow cropLajos Molnar2013-06-112-14/+19
* | | | | | | | | | | am bb35be24: am 7be48189: Merge "audioflinger: fix effects on direct output t...Eric Laurent2013-06-121-7/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 7be48189: Merge "audioflinger: fix effects on direct output threads" into ...Eric Laurent2013-06-121-7/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "audioflinger: fix effects on direct output threads" into jb-mr2-devEric Laurent2013-06-121-7/+5
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | audioflinger: fix effects on direct output threadsEric Laurent2013-06-111-7/+5
| | | | |_|/ / / / / | | | |/| | | | | |