summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for MPEG editlist gapless infoMarco Nelissen2013-05-231-0/+61
* stagefright: SoftVP8: Handle EOS flag on frames with content.Lajos Molnar2013-05-221-12/+16
* am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when switchin...Igor Murashkin2013-05-223-4/+27
|\
| * 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 1d60db8b: am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than...Mansoor Aftab2013-05-221-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| | |/
* | | am cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-220-0/+0
|\ \ \ | |/ /
| * | 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 9545b670: am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" int...Jamie Gennis2013-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 722e4892: am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 01831d23: Camera2/3: Increase digital zoom stepsZhijun He2013-05-211-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| | |/ /
* | | | Update to supply correct name for new power manager app ops.Dianne Hackborn2013-05-201-1/+2
* | | | am d7630634: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-200-0/+0
|\ \ \ \ | |/ / /
| * | | 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
| | |\ \ | | | |/ | | |/|
* | | | wifi-display: add support for metadata mode on encoder outputChong Zhang2013-05-1716-50/+432
* | | | am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-170-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 074eb387: am e2dfa5a4: Merge "update to Fence::waitForever() API change" i...Mathias Agopian2013-05-175-8/+4
|\ \ \ \ \ | |/ / / /
| * | | | 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 b07d3c48: am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-devAndy McFadden2013-05-172-4/+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
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Adjust timestamp scaleAndy McFadden2013-05-162-4/+4
| | | |/ /
* | | | | am b5b2d03f: am 99f27cdf: wifi-display: retry UDP read/write to improve conne...Chong Zhang2013-05-161-4/+25
|\ \ \ \ \ | |/ / / /
| * | | | am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| |\ \ \ \ | | |/ / /
| | * | | wifi-display: retry UDP read/write to improve connection robustnessChong Zhang2013-05-161-4/+25
| | |/ /
* | | | am a7f316e8: Reconcile with AOSPJean-Baptiste Queru2013-05-160-0/+0
|\ \ \ \ | |/ / /
| * | | Reconcile with AOSPJean-Baptiste Queru2013-05-160-0/+0
| |\ \ \
* | \ \ \ am affd710b: (-s ours) Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-05-160-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-150-0/+0
| | |\ \ \
| | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-140-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | | | | |\ \ \
| | | | | | * | | Camera3: Fix initial orientation configuration.Eino-Ville Talvala2013-05-101-5/+0
| | | | | | * | | merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-070-0/+0
| | | | | | | |\ \ \