summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/sys...cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-10.2cm-10.2Steve Kondik2013-09-190-0/+0
|\
| * camera_metadata: Add supportedHardwareLevel fieldIgor Murashkin2013-05-234-0/+145
* | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-2540-965/+19788
|\ \
| * | camera_metadata: Add supportedHardwareLevel fieldIgor Murashkin2013-05-234-0/+145
| |/
| * Camera: Metadata: Fix color format dump issueZhijun He2013-05-174-12/+41
| * Camera: Metadata: Fix the activeArraySize typo.Zhijun He2013-05-132-9/+9
| * Merge "Camera: Revise crop region definition." into jb-mr2-devEino-Ville Talvala2013-05-072-36/+117
| |\
| | * Camera: Revise crop region definition.Eino-Ville Talvala2013-05-072-36/+117
| * | Merge "camera_metadata: Fix inconsistencies in digital zoom reporting" into j...Igor Murashkin2013-05-074-57/+18
| |\ \
| | * | camera_metadata: Fix inconsistencies in digital zoom reportingIgor Murashkin2013-05-074-57/+18
| | |/
| * | Merge "Camera: Metadata: Fix a.ctrl.awbAvailableModes" into jb-mr2-devAlex Ray2013-05-072-3/+11
| |\ \ | | |/ | |/|
| | * Camera: Metadata: Fix a.ctrl.awbAvailableModesAlex Ray2013-05-012-3/+11
| * | camera_metadata: add validation function to ensure structural sanityIgor Murashkin2013-05-023-33/+272
| |/
| * camera_metadata: add new android.led.transmit and availableLeds fieldsIgor Murashkin2013-04-246-2/+340
| * Add liblogYing Wang2013-04-092-3/+3
| * camera_metadata: Mark enum snprint with non-hidden visibilityIgor Murashkin2013-04-023-10/+10
| * Camera: Metadata: Fix markdown error in Readme.mdAlex Ray2013-03-271-1/+1
| * Camera: Metadata: give explicit 3A starting statesAlex Ray2013-03-272-6/+12
| * Merge "Camera: Add trigger metadata entries." into jb-mr2-devEino-Ville Talvala2013-03-224-0/+208
| |\
| | * Camera: Add trigger metadata entries.Eino-Ville Talvala2013-03-184-0/+208
| * | Camera: Fix metadata generation on OS X.Eino-Ville Talvala2013-03-183-7/+7
| |/
| * Fix make checkbuild on Mac: swab() already declaredGlenn Kasten2013-02-121-3/+4
| * Add audio_route_reset_path()Ravi Kumar Alamanda2013-02-082-0/+51
| * am 721b107e: (-s ours) Camera: Fix ordering of boolean enums, types for curve...Eino-Ville Talvala2013-01-300-0/+0
| |\
| | * Camera: Fix ordering of boolean enums, types for curves.: DO NOT MERGEEino-Ville Talvala2013-01-304-36/+36
| * | am 095e4663: (-s ours) Camera2: Docs - Add output_file option to metadata_par...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Docs - Add output_file option to metadata_parser_xml.py: DO NOT MERGEIgor Murashkin2013-01-307-12/+10
| * | am 1653ad0e: (-s ours) Camera2: Docs - Fix tags to be displayed in the docs H...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Docs - Fix tags to be displayed in the docs HTML: DO NOT MERGEIgor Murashkin2013-01-303-7/+211
| * | am 7d4f08e0: (-s ours) Camera: Docs XML - allow multiple kinds per section: D...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera: Docs XML - allow multiple kinds per section: DO NOT MERGEIgor Murashkin2013-01-304-30/+63
| * | am f15f1ec0: (-s ours) Update camera metadata tests to new enums: DO NOT MERGEEino-Ville Talvala2013-01-300-0/+0
| |\|
| | * Update camera metadata tests to new enums: DO NOT MERGEEino-Ville Talvala2013-01-301-1/+1
| * | am ea88f67e: (-s ours) Camera2: Doc entries no longer have type=\'enum\', ins...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Doc entries no longer have type='enum', instead they use enum='true'...Igor Murashkin2013-01-3011-248/+266
| * | am f559bd26: (-s ours) Camera2: Update generate scripts check for dependencie...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Update generate scripts check for dependencies and to support MacPor...Igor Murashkin2013-01-305-23/+140
| * | am 5b6e79aa: (-s ours) Camera2: Dump enum data types as strings, not integers...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Dump enum data types as strings, not integers: DO NOT MERGEIgor Murashkin2013-01-304-20/+52
| * | am d728474a: (-s ours) Camera: Generate camera_metadata_tags and HTML docs fr...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera: Generate camera_metadata_tags and HTML docs from XML: DO NOT MERGEIgor Murashkin2013-01-304-911/+11946
| * | am 84a79d8c: (-s ours) Camera2: Fix metadata XML to maintain ordering: DO NOT...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Fix metadata XML to maintain ordering: DO NOT MERGEIgor Murashkin2013-01-303-32/+36
| * | am ca9e6549: (-s ours) Camera2: Prepare to generate tags from script: DO NOT ...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera2: Prepare to generate tags from script: DO NOT MERGEIgor Murashkin2013-01-304-44/+51
| * | am 2fcc8c97: (-s ours) Camera: Add a script to generate files from XML: DO NO...Igor Murashkin2013-01-300-0/+0
| |\|
| | * Camera: Add a script to generate files from XML: DO NOT MERGEIgor Murashkin2013-01-303-31/+81
| * | am f0356df1: (-s ours) Camera: Generate tag string info from XML: DO NOT MERGEIgor Murashkin2013-01-300-0/+0
| |\|
| | * Camera: Generate tag string info from XML: DO NOT MERGEIgor Murashkin2013-01-304-73/+368
| * | am b03a004f: (-s ours) Camera: Generate camera_metadata_tags.h from XML: DO N...Igor Murashkin2013-01-300-0/+0
| |\|