summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | Remove "required" label from DSA algorithm.Shawn Willden2015-02-031-1/+1
* | | | | | Merge "camera_common: add TORCH_MODE_STATUS_OFF"Chien-Yu Chen2015-02-031-2/+20
|\ \ \ \ \ \
| * | | | | | camera_common: add TORCH_MODE_STATUS_OFFChien-Yu Chen2015-01-291-2/+20
* | | | | | | am 9da1cb51: am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f3391a93: Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge changes I4ef53a09,I7c3c5bd5Shawn Willden2015-02-022-35/+24
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Remove get_output_size() method from keymaster HAL.Shawn Willden2015-02-021-12/+0
| | | * | | | Add tag to allow caller-specified nonce.Shawn Willden2015-02-021-23/+24
* | | | | | | am 3ec7c973: am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d5f7dbec: audio: Add audio parameter key for device connectHaynes Mathew George2015-02-021-0/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | audio: Add audio parameter key for device connectHaynes Mathew George2015-01-311-0/+1
| | | |_|_|/ | | |/| | |
* | | | | | am cb37e73b: am ee844515: Merge "Fix "error: \'strlen\' was not declared in t...Elliott Hughes2015-01-311-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fix "error: 'strlen' was not declared in this scope"."Elliott Hughes2015-01-311-0/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix "error: 'strlen' was not declared in this scope".Elliott Hughes2015-01-301-0/+1
| | |/ / /
* | | | | Merge "hardware keyguard HAL"Andres Morales2015-01-311-0/+92
|\ \ \ \ \
| * | | | | hardware keyguard HALAndres Morales2015-01-301-0/+92
* | | | | | Merge "camera HAL: Update camera_info with simultaneous access information."Ruben Brunk2015-01-301-0/+80
|\ \ \ \ \ \
| * | | | | | camera HAL: Update camera_info with simultaneous access information.Ruben Brunk2015-01-291-0/+80
* | | | | | | am 06b402dd: am ac41815a: Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am ac41815a: Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Add missing includes."Elliott Hughes2015-01-307-1/+8
| | |\ \ \ \ \
| | | * | | | | Add missing includes.Elliott Hughes2015-01-297-1/+8
| | |/ / / / /
* | | | | | | camera3: update reprocessing specZhijun He2015-01-292-4/+161
* | | | | | | am 2a96edc3: am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b2bc0e51: camera3: update ZSL specZhijun He2015-01-291-31/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | camera3: update ZSL specZhijun He2015-01-291-31/+2
* | | | | | | am 588f7259: am f4530d6e: Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f4530d6e: Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Add missing includes."Elliott Hughes2015-01-292-2/+4
| | |\ \ \ \ \
| | | * | | | | Add missing includes.Elliott Hughes2015-01-282-2/+4
* | | | | | | | am fb823c7f: am 1e541c22: Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1e541c22: Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge changes I85f430fb,I514a136bShawn Willden2015-01-292-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | Remove extraneous 'const' on rescope.Shawn Willden2015-01-261-1/+1
| | | * | | | | | Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH toShawn Willden2015-01-261-1/+1
* | | | | | | | | am 9e9fa066: am 1309477b: Merge "Add missing "const" on add_rng_entropy argum...Shawn Willden2015-01-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | am 1309477b: Merge "Add missing "const" on add_rng_entropy argument."Shawn Willden2015-01-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add missing "const" on add_rng_entropy argument."Shawn Willden2015-01-291-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | / / / / | | | |/ / / / | | |/| | | |
| | | * | | | Add missing "const" on add_rng_entropy argument.Shawn Willden2015-01-261-1/+1
* | | | | | | am c9832229: am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-261-3/+0
| | |\ \ \ \ \
| | | * | | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-3/+0
* | | | | | | | am e1d15dda: am 79c255ad: Merge "Change per-boot tag and remove rescope auth ...Shawn Willden2015-01-241-9/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."Shawn Willden2015-01-231-9/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Change per-boot tag and remove rescope auth timeout tag."Shawn Willden2015-01-231-9/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | Change per-boot tag and remove rescope auth timeout tag.Shawn Willden2015-01-231-9/+5
| | |/ / / /
* | | | | | Merge "camera: update HAL module API for external camera"Zhijun He2015-01-231-28/+101
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | camera: update HAL module API for external cameraZhijun He2015-01-231-28/+101
| | |_|_|/ | |/| | |