summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Camera: Add unit test infrastructure for libcameraclientIgor Murashkin2013-02-225-3/+70
* Camera: Add exists function to CameraMetadataIgor Murashkin2013-02-222-0/+11
* Camera: Move CameraMetadata.h from service to client libraryIgor Murashkin2013-02-2215-23/+23
* Merge "replace getISurfaceTexture by getIGraphicBufferProducer"Mathias Agopian2013-02-213-3/+3
|\
| * replace getISurfaceTexture by getIGraphicBufferProducerMathias Agopian2013-02-193-3/+3
* | Merge "Permit conditional registry of mediaserver extensions"Glenn Kasten2013-02-214-0/+57
|\ \
| * | Permit conditional registry of mediaserver extensionsGlenn Kasten2013-02-204-0/+57
| |/
* | Merge "CameraService: Log camera module name"Alex Ray2013-02-201-0/+1
|\ \
| * | CameraService: Log camera module nameAlex Ray2013-02-201-0/+1
| |/
* | Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl2013-02-200-0/+0
|\ \ | |/ |/|
| * A reference cannot be re-boundGlenn Kasten2013-02-191-20/+24
| * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-190-0/+0
| |\
| | * Temporary additional logging to investigate bugGlenn Kasten2013-02-149-23/+146
| | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-140-0/+0
| | |\
| | | * Temporary additional logging to investigate bugGlenn Kasten2013-02-137-17/+71
| | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-130-0/+0
| | | |\
| | | | * Temporary additional logging to investigate bugGlenn Kasten2013-02-125-11/+41
| | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-120-0/+0
| | | | |\
| | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-110-0/+0
| | | | | |\
| | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-070-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-060-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-050-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-040-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-02-010-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-310-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-300-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-280-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-250-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-230-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to masterThe Android Automerger2013-01-180-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * Fix AudioRecordGlenn Kasten2013-01-101-2/+2
* | | | | | | | | | | | | | | | | | A reference cannot be re-boundGlenn Kasten2013-02-191-20/+24
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Revert "Temporary additional logging to investigate bug""Glenn Kasten2013-02-159-220/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-159-220/+26
* | | | | | | | | | | | | | | | | | Merge "Temporary additional logging to investigate bug"Glenn Kasten2013-02-159-26/+220
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Temporary additional logging to investigate bugGlenn Kasten2013-02-159-26/+220
* | | | | | | | | | | | | | | | | | Merge "Refactoring: Rename SurfaceTextureClient to Surface"Mathias Agopian2013-02-1529-71/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-1529-71/+71
* | | | | | | | | | | | | | | | | | Remove FragmentedMP4ExtractorMarco Nelissen2013-02-155-544/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Add support for fragmented mp4 to MPEG4ExtractorMarco Nelissen2013-02-154-29/+899
* | | | | | | | | | | | | | | | | Merge "Revert "Temporary additional logging to investigate bug""Glenn Kasten2013-02-149-146/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-149-146/+23
* | | | | | | | | | | | | | | | | | Merge "Temporary additional logging to investigate bug"Glenn Kasten2013-02-149-23/+146
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Temporary additional logging to investigate bugGlenn Kasten2013-02-149-23/+146
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Add a test utility for MediaMuxer."ztenghui2013-02-142-0/+318
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add a test utility for MediaMuxer.ztenghui2013-02-132-0/+318
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "Revert "Temporary additional logging to investigate bug""Glenn Kasten2013-02-147-71/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revert "Temporary additional logging to investigate bug"Glenn Kasten2013-02-147-71/+17
* | | | | | | | | | | | | | | | | Merge "Temporary additional logging to investigate bug"Glenn Kasten2013-02-147-17/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Temporary additional logging to investigate bugGlenn Kasten2013-02-137-17/+71
| |/ / / / / / / / / / / / / / /