summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
|\
| * Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-devLajos Molnar2013-05-292-7/+1
| |\
| | * MediaMuxer: Remove SAMPLE_FLAG_SYNC flagLajos Molnar2013-05-282-7/+1
* | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-290-0/+0
|\ \ \
| * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-290-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows m...Igor Murashkin2013-05-284-2/+15
|\ \ \ \ | |/ / /
| * | | Merge "camera3: Don't try to disconnect stream native windows more than once"...Igor Murashkin2013-05-284-2/+15
| |\ \ \ | | |_|/ | |/| |
| | * | camera3: Don't try to disconnect stream native windows more than onceIgor Murashkin2013-05-284-2/+15
* | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-280-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-260-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-240-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-242-3/+15
| * | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
| * | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-232-12/+20
* | | | am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming"...Zhijun He2013-05-242-3/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-devZhijun He2013-05-242-3/+15
| |\ \ \
| | * | | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
* | | | | am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into j...Ed Heyl2013-05-231-5/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-devEd Heyl2013-05-241-5/+13
| |\ \ \ \
| | * | | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
* | | | | | am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condi...Igor Murashkin2013-05-232-12/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb...Igor Murashkin2013-05-232-12/+20
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-222-12/+20
| | |/ /
* | | | am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other thre...Igor Murashkin2013-05-233-0/+39
|\ \ \ \ | |/ / /
| * | | Merge "Camera3: Make sure new metadata results signal other threads waiting" ...Igor Murashkin2013-05-233-0/+39
| |\ \ \ | | |/ / | |/| |
| | * | Camera3: Make sure new metadata results signal other threads waitingIgor Murashkin2013-05-223-0/+39
* | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-230-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-230-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions...Igor Murashkin2013-05-223-4/+27
|\ \ \ \ | |/ / /
| * | | Merge "camera3: Fix recording failure when switching resolutions while previe...Igor Murashkin2013-05-223-4/+27
| |\ \ \
| | * | | camera3: Fix recording failure when switching resolutions while preview onIgor Murashkin2013-05-223-4/+27
| | | |/ | | |/|
* | | | am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
|\ \ \ \ | |/ / /
| * | | Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
| |/ /
* | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-220-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-220-0/+0
| |\ \ | | |/ | |/|
| | * Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-211-11/+17
* | | am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
|\ \ \ | |/ /
| * | Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-devJamie Gennis2013-05-211-11/+17
| |\ \
| | * | Avoid a deadlock during EmptyBufferDoneAndreas Huber2013-05-201-11/+17
* | | | am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
|\ \ \ \ | |/ / /
| * | | Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| |/ /
* | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-190-0/+0
| |\ \ | | |/ | |/|
* | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-160-0/+0
| |\ \
* | \ \ am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "update to Fence::waitForever() API change" into jb-mr2-devMathias Agopian2013-05-175-8/+4
| |\ \ \
| | * | | update to Fence::waitForever() API changeMathias Agopian2013-05-165-8/+4
* | | | | am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.1 at 2025-03-15 06:52:42 +0000