Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | * | | | | | | Camera3: Fix initial orientation configuration. | Eino-Ville Talvala | 2013-05-10 | 1 | -5/+0 | |
| | | | | * | | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-08 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-07 | 0 | -0/+0 | |
| | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-06 | 0 | -0/+0 | |
| | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-02 | 0 | -0/+0 | |
| | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | * | | | | | | Fix reverb at 48kHz | Eric Laurent | 2013-05-01 | 1 | -6/+6 | |
| | | | | | | | | * | | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-05-01 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-29 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-25 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-24 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-23 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-22 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | * | | | | | | Fix error message to match CTS | Glenn Kasten | 2013-04-19 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | * | | | | | | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-18 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-17 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | * \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-16 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | \ \ \ \ \ \ | Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp | Conley Owens | 2013-05-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev | Conley Owens | 2013-05-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Empty test commit for AOSP | Conley Owens | 2013-05-14 | 0 | -0/+0 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response" | Andreas Huber | 2013-03-15 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Merge "Fix for crash if no content in DESCRIBE response" | Andreas Huber | 2013-03-15 | 1 | -0/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Fix for crash if no content in DESCRIBE response | Xuefei Chen | 2013-03-12 | 1 | -0/+3 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | am f0cea9f8: Merge "Prevent invalid frame durations" | Glenn Kasten | 2013-03-15 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Prevent invalid frame durations" | Glenn Kasten | 2013-03-15 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | Prevent invalid frame durations | Ola Andersson | 2013-03-12 | 1 | -0/+6 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Recon... | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-... | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release -... | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | | | * | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not merge | Jean-Baptiste Queru | 2013-03-11 | 0 | -0/+0 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Avoid invalid memory access when using extractMetadata()" | Marco Nelissen | 2013-03-01 | 1 | -1/+16 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid invalid memory access when using extractMetadata() | Sangkyu Lee | 2013-02-28 | 1 | -1/+16 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "SoftAMR: Signal the right frame format" | Andreas Huber | 2013-02-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftAMR: Signal the right frame format | Martin Storsjo | 2013-02-17 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "SoftVorbis: Set the right encoding in the port definition" | Andreas Huber | 2013-02-27 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftVorbis: Set the right encoding in the port definition | Martin Storsjo | 2013-01-31 | 1 | -1/+1 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "MPEG4Writer: Write a zero-length compressor string" | Andreas Huber | 2013-02-27 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Writer: Write a zero-length compressor string | Martin Storsjo | 2013-01-31 | 1 | -1/+2 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT M... | Eino-Ville Talvala | 2013-01-30 | 2 | -15/+24 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE | Eino-Ville Talvala | 2013-01-30 | 2 | -15/+24 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE | Igor Murashkin | 2013-01-30 | 4 | -153/+153 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2: fix metadata symbols: DO NOT MERGE | Igor Murashkin | 2013-01-30 | 4 | -153/+153 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | am 12834fe2: Merge "libvideoeditor: fix code bugs when enabling all-level deb... | James Dong | 2012-12-21 | 3 | -4/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros" | James Dong | 2012-12-21 | 3 | -4/+4 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am b54cedab: Merge "Use default values when MPEG4 audio config parsing fails." | James Dong | 2012-12-21 | 1 | -3/+10 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use default values when MPEG4 audio config parsing fails." | James Dong | 2012-12-20 | 1 | -3/+10 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Use default values when MPEG4 audio config parsing fails. | Erik Rydgren | 2012-11-19 | 1 | -3/+10 | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2a55b596: Merge "libvideoeditor: fix cannot show some thumbnails in storyb... | James Dong | 2012-12-20 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libvideoeditor: fix cannot show some thumbnails in storyboard or no fr... | James Dong | 2012-12-20 | 1 | -0/+6 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | libvideoeditor: fix cannot show some thumbnails in storyboard or no frame dis... | beanz | 2012-11-16 | 1 | -0/+6 |