Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev | Eino-Ville Talvala | 2012-10-19 | 1 | -7/+11 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Camera2: Fix potential deadlock" into jb-mr1-dev | Eino-Ville Talvala | 2012-10-19 | 1 | -7/+11 | |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | * | | | | | | Camera2: Fix potential deadlock | Eino-Ville Talvala | 2012-10-17 | 1 | -7/+11 | |
| | | |/ / / / | | |/| | | | | ||||||
* | | | | | | | am 3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev | Marco Nelissen | 2012-10-19 | 3 | -2/+8 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Fix valgrind issues" into jb-mr1-dev | Marco Nelissen | 2012-10-19 | 3 | -2/+8 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix valgrind issues | Marco Nelissen | 2012-10-17 | 3 | -2/+8 | |
| | | |_|/ / / | | |/| | | | | ||||||
* | | | | | | | am 291f824e: Remove active track when thread goes to standby | Glenn Kasten | 2012-10-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Remove active track when thread goes to standby | Glenn Kasten | 2012-10-18 | 1 | -3/+3 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | am 1baa01a5: Merge "hardening: eliminate more .text relocations" | Nick Kralevich | 2012-10-19 | 1 | -2/+4 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge "hardening: eliminate more .text relocations" | Nick Kralevich | 2012-10-19 | 1 | -2/+4 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | hardening: eliminate more .text relocations | Nick Kralevich | 2012-10-18 | 1 | -2/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | am ccd08439: Added some extra failure logging messages | James Dong | 2012-10-17 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Added some extra failure logging messages | James Dong | 2012-10-17 | 2 | -0/+8 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to ke... | Glenn Kasten | 2012-10-17 | 2 | -3/+3 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge "Manually merge change #111620 from tc3 to mainline, to keep the" | Glenn Kasten | 2012-10-17 | 2 | -3/+3 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Manually merge change #111620 from tc3 to mainline, to keep the | Dan Bornstein | 2012-10-17 | 2 | -3/+3 | |
* | | | | | | | am dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree." | Glenn Kasten | 2012-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Rename "Makefile" to "Android.mk" throughout the tree." | Glenn Kasten | 2012-10-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Rename "Makefile" to "Android.mk" throughout the tree. | Dave Bort | 2012-10-17 | 1 | -1/+1 | |
* | | | | | | | am 4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system." | Glenn Kasten | 2012-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Rename "TARGET" to "MODULE" in the build system." | Glenn Kasten | 2012-10-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Rename "TARGET" to "MODULE" in the build system. | Dave Bort | 2012-10-17 | 1 | -1/+1 | |
* | | | | | | | am 108e1961: Merge "Tweak the SINC resampler parameters and double the perfor... | Glenn Kasten | 2012-10-17 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "Tweak the SINC resampler parameters and double the performance. It's u... | Glenn Kasten | 2012-10-17 | 1 | -3/+3 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Tweak the SINC resampler parameters and double the performance. It's using ab... | Mathias Agopian | 2012-10-17 | 1 | -3/+3 | |
* | | | | | | | am a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet,... | Glenn Kasten | 2012-10-17 | 1 | -13/+29 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully fun... | Glenn Kasten | 2012-10-17 | 1 | -13/+29 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | A sinc resampler for Audioflinger. It's not enabled yet, but fully functional... | Mathias Agopian | 2012-10-17 | 1 | -13/+29 | |
* | | | | | | | am 5e8e3fc3: Merge "fix a few small typos in the FIR computation" | Glenn Kasten | 2012-10-17 | 1 | -6/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "fix a few small typos in the FIR computation" | Glenn Kasten | 2012-10-17 | 1 | -6/+2 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | fix a few small typos in the FIR computation | Mathias Agopian | 2012-10-17 | 1 | -6/+2 | |
* | | | | | | | am d2186701: Merge "This is a tool to compute the the reconstruction filter c... | Glenn Kasten | 2012-10-17 | 2 | -0/+126 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge "This is a tool to compute the the reconstruction filter coefficients f... | Glenn Kasten | 2012-10-17 | 2 | -0/+126 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | This is a tool to compute the the reconstruction filter coefficients for a si... | Mathias Agopian | 2012-10-17 | 2 | -0/+126 | |
| |/ / / / / | ||||||
* | | | | | | am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev | Eino-Ville Talvala | 2012-10-16 | 2 | -2/+9 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev | Eino-Ville Talvala | 2012-10-16 | 2 | -2/+9 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | Camera2: Improve quirks focusing behavior. | Eino-Ville Talvala | 2012-10-16 | 2 | -2/+9 | |
* | | | | | | am bbe11e46: Merge "Fix track estimation for presentation complete" into jb-m... | Jean-Michel Trivi | 2012-10-16 | 1 | -4/+2 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge "Fix track estimation for presentation complete" into jb-mr1-dev | Jean-Michel Trivi | 2012-10-16 | 1 | -4/+2 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix track estimation for presentation complete | Jean-Michel Trivi | 2012-10-16 | 1 | -4/+2 | |
* | | | | | | am 54717320: Camera2: Don\'t touch frame counter on output frames. | Eino-Ville Talvala | 2012-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Camera2: Don't touch frame counter on output frames. | Eino-Ville Talvala | 2012-10-16 | 1 | -1/+1 | |
* | | | | | | am d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigge... | Eino-Ville Talvala | 2012-10-16 | 3 | -4/+41 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Camera2: When focus is already locked in CAF mode, do not trigger HAL. | Eino-Ville Talvala | 2012-10-16 | 3 | -4/+41 | |
| |/ / / / | ||||||
* | | | | | Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp | Glenn Kasten | 2012-10-15 | 1 | -5/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix log spam: Failed to open libwvm.so | Glenn Kasten | 2012-10-12 | 1 | -5/+8 | |
| | | | | | | ||||||
| \ \ \ \ \ | ||||||
*-. \ \ \ \ \ | Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge | The Android Open Source Project | 2012-10-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | ||||||
| | * | | | merge in jb-mr1-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-12 | 0 | -0/+0 | |
| | |\ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-12 | 0 | -0/+0 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-dev | The Android Automerger | 2012-10-11 | 0 | -0/+0 | |
| | |\ \ \ |