summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | am f5f6487e: am d8e585e7: am 006209c2: Merge "Remove reflection instantiation...Adam Lesinski2014-03-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am d8e585e7: am 006209c2: Merge "Remove reflection instantiation of Accessibi...Adam Lesinski2014-03-171-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 006209c2: Merge "Remove reflection instantiation of Accessibility" into kl...Adam Lesinski2014-03-171-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge "Remove reflection instantiation of Accessibility" into klp-modular-devAdam Lesinski2014-03-171-2/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | Remove reflection instantiation of AccessibilityAdam Lesinski2014-03-171-2/+3
* | | | | | | | | | | | | | | | | | | | am e9529bc4: am d292aac5: am 889a1ddd: Fix JavaDocBen Murdoch2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am d292aac5: am 889a1ddd: Fix JavaDocBen Murdoch2014-03-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 889a1ddd: Fix JavaDocBen Murdoch2014-03-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Fix JavaDocBen Murdoch2014-03-171-1/+1
* | | | | | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of a1ca303a to master"Doug Zongker2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of a1ca303a to masterDoug Zongker2014-03-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 966bfa8d: am 01252217: Merge "Fix javadoc." into klp-modular-devTorne (Richard Coles)2014-03-171-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | am 01252217: Merge "Fix javadoc." into klp-modular-devTorne (Richard Coles)2014-03-171-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Merge "Fix javadoc." into klp-modular-devTorne (Richard Coles)2014-03-171-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Fix javadoc.Torne (Richard Coles)2014-03-171-1/+1
* | | | | | | | | | | | | | | | | | | | | | Lower tap timeout to 100ms, because 180ms is a lot of msAlan Viverette2014-03-171-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Build logtags for services"Alan Viverette2014-03-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Build logtags for servicesAlan Viverette2014-03-171-0/+4
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix the missing spot shadow when DEBUG_SHADOW is turned on"ztenghui2014-03-171-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix the missing spot shadow when DEBUG_SHADOW is turned onztenghui2014-03-171-1/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "camera2: Don't log vendor tag errors when camera HAL too old"Igor Murashkin2014-03-172-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-172-10/+10
* | | | | | | | | | | | | | | | | | | | | | | Merge "Create one hole inside the umbra area to avoid overdraw."ztenghui2014-03-179-140/+215
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Create one hole inside the umbra area to avoid overdraw.ztenghui2014-03-179-140/+215
* | | | | | | | | | | | | | | | | | | | | | Merge "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-179-168/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remove castsShadow and globalCamera APIsChris Craik2014-03-179-168/+5
* | | | | | | | | | | | | | | | | | | | | | | am 9229c596: (-s ours) am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281...Geoff Mendal2014-03-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am ae327cd2: (-s ours) am 02899291: (-s ours) am c3281db2: (-s ours) am 65325...Geoff Mendal2014-03-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am 02899291: (-s ours) am c3281db2: (-s ours) am 65325236: (-s ours) Import t...Geoff Mendal2014-03-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am c3281db2: (-s ours) am 65325236: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | / / / / / / / / / / / / | | | | | |_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | am 65325236: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-03-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-172-5/+5
* | | | | | | | | | | | | | | | | | | | | | Merge "Start enforcing explicit intents for Context.bindService()"Dianne Hackborn2014-03-174-10/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Start enforcing explicit intents for Context.bindService()Dianne Hackborn2014-03-174-10/+22
* | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Remove castsShadow and globalCamera APIs""Chris Craik2014-03-178-5/+152
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Revert "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-178-5/+152
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove castsShadow and globalCamera APIs"Chris Craik2014-03-178-152/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Remove castsShadow and globalCamera APIsChris Craik2014-03-178-152/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-11/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-171-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-1732-64/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-1732-64/+32
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-03-171-1/+1
| |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "Rename DisplayList->RenderNode"John Reck2014-03-1716-1078/+1103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Rename DisplayList->RenderNodeJohn Reck2014-03-1716-1078/+1103
* | | | | | | | | | | | | | | | | | | | | Merge "Standardize the provisioning intent action."Jessica Hummel2014-03-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Standardize the provisioning intent action.Jessica Hummel2014-03-172-2/+2
| | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |