summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e0270e79: am f71224ce: Merge "audioflinger: forward flush to direct output...Eric Laurent2014-10-013-4/+16
|\
| * am f71224ce: Merge "audioflinger: forward flush to direct output streams" int...Eric Laurent2014-10-013-4/+16
| |\
| | * Merge "audioflinger: forward flush to direct output streams" into lmp-devEric Laurent2014-09-303-4/+16
| | |\
| | | * audioflinger: forward flush to direct output streamsEric Laurent2014-09-293-4/+16
* | | | am 16450e9f: am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem ...Eino-Ville Talvala2014-10-011-1/+14
|\ \ \ \ | |/ / /
| * | | am c8c05d6a: Merge "CameraService: API1: Reallocate JPEG ashmem heap if size ...Eino-Ville Talvala2014-10-011-1/+14
| |\ \ \ | | |/ /
| | * | Merge "CameraService: API1: Reallocate JPEG ashmem heap if size changes" into...Eino-Ville Talvala2014-09-291-1/+14
| | |\ \
| | | * | CameraService: API1: Reallocate JPEG ashmem heap if size changesEino-Ville Talvala2014-09-291-1/+14
| | | |/
* | | | am 00cd942e: am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-301-3/+5
|\ \ \ \ | |/ / /
| * | | am 4379c034: Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-301-3/+5
| |\ \ \ | | |/ /
| | * | Merge "Fix tee sink" into lmp-devGlenn Kasten2014-09-291-3/+5
| | |\ \ | | | |/ | | |/|
| | | * Fix tee sinkGlenn Kasten2014-09-281-3/+5
* | | | am 28cdaed3: am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to...Eino-Ville Talvala2014-09-302-47/+69
|\ \ \ \ | |/ / /
| * | | am dc2e6ddc: Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-302-47/+69
| |\ \ \ | | |/ /
| | * | Camera2Client: Revert HALv2 device behavior back to MR2Eino-Ville Talvala2014-09-282-47/+69
| | |/
* | | am 8a82259d: am 91228597: am 95fd067c: Merge "Fix linkage when building with ...Chih-hung Hsieh2014-09-301-0/+4
|\ \ \ | |/ /
| * | am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel ...Chih-hung Hsieh2014-09-301-0/+4
| |\ \
| | * \ am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"Chih-hung Hsieh2014-09-301-0/+4
| | |\ \
| | | * \ Merge "Fix linkage when building with clang, Intel CC or gcc -O0"Chih-hung Hsieh2014-09-301-0/+4
| | | |\ \
| | | | * | Fix linkage when building with clang, Intel CC or gcc -O0Bernhard Rosenkraenzer2014-09-281-0/+4
| | | |/ /
* | | | | am e4782470: am a67ced97: Merge "CameraService: API1: Fix flash mode" into lm...Eino-Ville Talvala2014-09-291-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am a67ced97: Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "CameraService: API1: Fix flash mode" into lmp-devEino-Ville Talvala2014-09-271-1/+1
| | |\ \ \
| | | * | | CameraService: API1: Fix flash modeEino-Ville Talvala2014-09-271-1/+1
* | | | | | am d1ed2a18: am a8a4eeb9: Merge "audio policy: favor mixed over direct output...Eric Laurent2014-09-291-1/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a8a4eeb9: Merge "audio policy: favor mixed over direct output for PCM form...Eric Laurent2014-09-271-1/+11
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "audio policy: favor mixed over direct output for PCM format" into lmp-devEric Laurent2014-09-261-1/+11
| | |\ \ \ \
| | | * | | | audio policy: favor mixed over direct output for PCM formatEric Laurent2014-09-261-1/+11
* | | | | | | am 474d1d40: am 504de531: Merge "audio: fix stream type for accessibility usa...Eric Laurent2014-09-299-3/+58
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-269-3/+58
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-269-3/+58
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | audio: fix stream type for accessibility usageEric Laurent2014-09-259-3/+58
* | | | | | | am 3f76ca9d: am c53b98f3: am 6cd6792a: Merge "Allow building on clang without...Ian Rogers2014-09-291-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c53b98f3: am 6cd6792a: Merge "Allow building on clang without __builtin_as...Ian Rogers2014-09-261-1/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | am 6cd6792a: Merge "Allow building on clang without __builtin_assume_aligned"Ian Rogers2014-09-261-1/+4
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge "Allow building on clang without __builtin_assume_aligned"Ian Rogers2014-09-261-1/+4
| | | |\ \ \ \
| | | | * | | | Allow building on clang without __builtin_assume_alignedBernhard Rosenkraenzer2014-09-191-1/+4
* | | | | | | | am d0eda851: am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to ch...Glenn Kasten2014-09-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3a94ca56: am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am fc36efee: Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix comparison of String8 to char* literal"Glenn Kasten2014-09-261-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Fix comparison of String8 to char* literalBernhard Rosenkraenzer2014-09-181-1/+1
* | | | | | | | am bedf4b8b: am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys...Eino-Ville Talvala2014-09-261-10/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5f5d0544: Merge "Camera1 shim: If there\'s no flash, the keys need to be n...Eino-Ville Talvala2014-09-261-10/+13
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Camera1 shim: If there's no flash, the keys need to be null." into lmp...Eino-Ville Talvala2014-09-261-10/+13
| | |\ \ \ \ \ \
| | | * | | | | | Camera1 shim: If there's no flash, the keys need to be null.Eino-Ville Talvala2014-09-251-10/+13
* | | | | | | | | am 18e10cb1: am 0ed72488: Merge "NuPlayer: use format obtained from source to...Wei Jia2014-09-261-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if vide...Wei Jia2014-09-261-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "NuPlayer: use format obtained from source to tell if video exists." in...Wei Jia2014-09-261-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1