summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\
| * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | | |\
| | | | | * Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | | |\
| | | | | | | * Cleanup openRecord error handlingGlenn Kasten2013-10-075-3/+29
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | | | | |\
| | | | | | | | * TimedEventQueue takes a wake lockEric Laurent2013-10-043-3/+99
| | | | | | | | * fix offload audio effect proxy implementation uuidEric Laurent2013-10-041-1/+2
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | | | |\
| | | | | | | | | * MediaCodecInfo: report supported color formats for non-native-window modeLajos Molnar2013-10-011-6/+6
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * Camera2 API: Hack: Always use async mode with GLConsumerEino-Ville Talvala2013-09-261-1/+18
| | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-250-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * AudioTrack: fix music resumeEric Laurent2013-09-232-4/+6
| | | | | | | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | \ am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "Camera: don't do hw support check for ZSL" into klp-devZhijun He2013-10-161-13/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Camera: don't do hw support check for ZSLZhijun He2013-10-161-13/+5
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-163-1/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | AudioTrack: fix head position after restoreEric Laurent2013-10-163-1/+26
| | |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | am d5766875: AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-161-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | AwesomePlayer: fix concurrent pause and teardownEric Laurent2013-10-151-0/+6
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | am 014e7fa2: Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Make Audio wakelock names less unique.Narayan Kamath2013-10-142-2/+23
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-131-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | SoundPool: handle new audio track eventEric Laurent2013-10-121-2/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 15ad2470: Camera: Fix deadlock in Camera3OutputStreamZhijun He2013-10-111-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Camera: Fix deadlock in Camera3OutputStreamZhijun He2013-10-111-1/+16
* | | | | | | | | | | | | am d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Camera: Skip AE precapture when possible" into klp-devZhijun He2013-10-111-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | am 1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-devEino-Ville Talvala2013-10-117-2/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Camera2/3: Add more tracing for API1" into klp-devEino-Ville Talvala2013-10-117-2/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Camera2/3: Add more tracing for API1Eino-Ville Talvala2013-10-107-2/+56
| | |/ / / / / / / / / /
* | | | | | | | | | | | am cc27e117: Camera: Save 1 frame time for takePicture callZhijun He2013-10-093-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Camera: Save 1 frame time for takePicture callZhijun He2013-10-093-10/+10
| |/ / / / / / / / / /
* | | | | | | | | | | am b6028c42: merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ am 828363da: Merge "camera2: Don\'t race while dumping last frame metadata" i...Igor Murashkin2013-10-082-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "camera2: Don't race while dumping last frame metadata" into klp-devIgor Murashkin2013-10-082-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | camera2: Don't race while dumping last frame metadataIgor Murashkin2013-10-072-1/+10