summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | am 9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-devEino-Ville Talvala2012-10-191-7/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Camera2: Fix potential deadlock" into jb-mr1-devEino-Ville Talvala2012-10-191-7/+11
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Camera2: Fix potential deadlockEino-Ville Talvala2012-10-171-7/+11
| | | |/ / / / | | |/| | | |
* | | | | | | am 3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-devMarco Nelissen2012-10-193-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix valgrind issues" into jb-mr1-devMarco Nelissen2012-10-193-2/+8
| |\ \ \ \ \ \
| | * | | | | | Fix valgrind issuesMarco Nelissen2012-10-173-2/+8
| | | |_|/ / / | | |/| | | |
* | | | | | | am 291f824e: Remove active track when thread goes to standbyGlenn Kasten2012-10-191-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove active track when thread goes to standbyGlenn Kasten2012-10-181-3/+3
| | |_|/ / / | |/| | | |
* | | | | | am 1baa01a5: Merge "hardening: eliminate more .text relocations"Nick Kralevich2012-10-191-2/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "hardening: eliminate more .text relocations"Nick Kralevich2012-10-191-2/+4
| |\ \ \ \ \ \
| | * | | | | | hardening: eliminate more .text relocationsNick Kralevich2012-10-181-2/+4
| |/ / / / / /
* | | | | | | am ccd08439: Added some extra failure logging messagesJames Dong2012-10-172-0/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Added some extra failure logging messagesJames Dong2012-10-172-0/+8
| | |_|/ / / | |/| | | |
* | | | | | am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to ke...Glenn Kasten2012-10-172-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Manually merge change #111620 from tc3 to mainline, to keep the"Glenn Kasten2012-10-172-3/+3
| |\ \ \ \ \
| | * | | | | Manually merge change #111620 from tc3 to mainline, to keep theDan Bornstein2012-10-172-3/+3
* | | | | | | am dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."Glenn Kasten2012-10-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Rename "Makefile" to "Android.mk" throughout the tree."Glenn Kasten2012-10-171-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Rename "Makefile" to "Android.mk" throughout the tree.Dave Bort2012-10-171-1/+1
* | | | | | | am 4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system."Glenn Kasten2012-10-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Rename "TARGET" to "MODULE" in the build system."Glenn Kasten2012-10-171-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Rename "TARGET" to "MODULE" in the build system.Dave Bort2012-10-171-1/+1
* | | | | | | am 108e1961: Merge "Tweak the SINC resampler parameters and double the perfor...Glenn Kasten2012-10-171-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Tweak the SINC resampler parameters and double the performance. It's u...Glenn Kasten2012-10-171-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Tweak the SINC resampler parameters and double the performance. It's using ab...Mathias Agopian2012-10-171-3/+3
* | | | | | | am a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet,...Glenn Kasten2012-10-171-13/+29
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully fun...Glenn Kasten2012-10-171-13/+29
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | A sinc resampler for Audioflinger. It's not enabled yet, but fully functional...Mathias Agopian2012-10-171-13/+29
* | | | | | | am 5e8e3fc3: Merge "fix a few small typos in the FIR computation"Glenn Kasten2012-10-171-6/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "fix a few small typos in the FIR computation"Glenn Kasten2012-10-171-6/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | fix a few small typos in the FIR computationMathias Agopian2012-10-171-6/+2
* | | | | | | am d2186701: Merge "This is a tool to compute the the reconstruction filter c...Glenn Kasten2012-10-172-0/+126
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "This is a tool to compute the the reconstruction filter coefficients f...Glenn Kasten2012-10-172-0/+126
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | This is a tool to compute the the reconstruction filter coefficients for a si...Mathias Agopian2012-10-172-0/+126
| |/ / / / /
* | | | | | am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-devEino-Ville Talvala2012-10-162-2/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-devEino-Ville Talvala2012-10-162-2/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Camera2: Improve quirks focusing behavior.Eino-Ville Talvala2012-10-162-2/+9
* | | | | | am bbe11e46: Merge "Fix track estimation for presentation complete" into jb-m...Jean-Michel Trivi2012-10-161-4/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix track estimation for presentation complete" into jb-mr1-devJean-Michel Trivi2012-10-161-4/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix track estimation for presentation completeJean-Michel Trivi2012-10-161-4/+2
* | | | | | am 54717320: Camera2: Don\'t touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: Don't touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
* | | | | | am d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigge...Eino-Ville Talvala2012-10-163-4/+41
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: When focus is already locked in CAF mode, do not trigger HAL.Eino-Ville Talvala2012-10-163-4/+41
| |/ / / /
* | | | | Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aospGlenn Kasten2012-10-151-5/+8
|\ \ \ \ \
| * | | | | Fix log spam: Failed to open libwvm.soGlenn Kasten2012-10-121-5/+8
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-150-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \ \