summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 98b9221a: am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in key...Jim Miller2012-05-246-43/+49
|\
| * am c7f82cc7: Merge "Fix 6535413: Fix overlapping controls in keyguard" into j...Jim Miller2012-05-246-43/+49
| |\
| | * Merge "Fix 6535413: Fix overlapping controls in keyguard" into jb-devJim Miller2012-05-246-43/+49
| | |\
| | | * Fix 6535413: Fix overlapping controls in keyguardJim Miller2012-05-246-43/+49
* | | | am b3db8dc9: am 97594d6c: Merge "Unhide KeyguardManager locked and secure sta...Jean-Michel Trivi2012-05-241-12/+4
|\ \ \ \ | |/ / /
| * | | am 97594d6c: Merge "Unhide KeyguardManager locked and secure state getters" i...Jean-Michel Trivi2012-05-241-12/+4
| |\ \ \ | | |/ /
| | * | Merge "Unhide KeyguardManager locked and secure state getters" into jb-devJean-Michel Trivi2012-05-241-12/+4
| | |\ \
| | | * | Unhide KeyguardManager locked and secure state gettersJean-Michel Trivi2012-05-241-12/+4
* | | | | am 731327a9: am f7388102: Merge "Support skipping a touch stream due to lack ...John Reck2012-05-242-5/+23
|\ \ \ \ \ | |/ / / /
| * | | | am f7388102: Merge "Support skipping a touch stream due to lack of handlers" ...John Reck2012-05-242-5/+23
| |\ \ \ \ | | |/ / /
| | * | | Merge "Support skipping a touch stream due to lack of handlers" into jb-devJohn Reck2012-05-242-5/+23
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Support skipping a touch stream due to lack of handlersJohn Reck2012-05-242-5/+23
* | | | | am 4414bdef: am 73bde11e: Merge "Fix 6547012: ignore events outside the home/...Jim Miller2012-05-241-14/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 73bde11e: Merge "Fix 6547012: ignore events outside the home/back/recent n...Jim Miller2012-05-241-14/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix 6547012: ignore events outside the home/back/recent navigation are...Jim Miller2012-05-241-14/+6
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix 6547012: ignore events outside the home/back/recent navigation areaJim Miller2012-05-241-14/+6
* | | | | am ed130313: am 94328c30: Merge "Clear bitmap references from display lists a...Romain Guy2012-05-244-6/+27
|\ \ \ \ \ | |/ / / /
| * | | | am 94328c30: Merge "Clear bitmap references from display lists as early as po...Romain Guy2012-05-244-6/+27
| |\ \ \ \ | | |/ / /
| | * | | Merge "Clear bitmap references from display lists as early as possible Bug #6...Romain Guy2012-05-244-6/+27
| | |\ \ \
| | | * | | Clear bitmap references from display lists as early as possibleRomain Guy2012-05-244-6/+27
* | | | | | am 07e28d1e: am 0100625b: Merge "Fix bug #6522190 MountService should respond...Fabrice Di Meglio2012-05-241-12/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0100625b: Merge "Fix bug #6522190 MountService should respond to configura...Fabrice Di Meglio2012-05-241-12/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix bug #6522190 MountService should respond to configuration changes ...Fabrice Di Meglio2012-05-241-12/+17
| | |\ \ \ \
| | | * | | | Fix bug #6522190 MountService should respond to configuration changes ("INTER...Fabrice Di Meglio2012-05-231-12/+17
| | | | |/ / | | | |/| |
* | | | | | am 4f313676: am 222f5613: Merge "Use setCustomSelectActionModeCallback to dis...George Mount2012-05-241-9/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 222f5613: Merge "Use setCustomSelectActionModeCallback to disallow action ...George Mount2012-05-241-9/+22
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Use setCustomSelectActionModeCallback to disallow action bar." into jb...George Mount2012-05-241-9/+22
| | |\ \ \ \
| | | * | | | Use setCustomSelectActionModeCallback to disallow action bar.George Mount2012-05-241-9/+22
* | | | | | | resolved conflicts for merge of cde7efde to masterBen Murdoch2012-05-242-3/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a95e9da7: Merge "Make the WebCore thread watchdog opt in." into jb-devBen Murdoch2012-05-242-3/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Make the WebCore thread watchdog opt in." into jb-devBen Murdoch2012-05-242-3/+21
| | |\ \ \ \ \
| | | * | | | | Make the WebCore thread watchdog opt in.Ben Murdoch2012-05-242-3/+21
| | | | |_|_|/ | | | |/| | |
* | | | | | | am af239b5f: am fd824487: Merge "Fix 6449259: FUL no longer overlaps music co...Brian Colonna2012-05-241-3/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am fd824487: Merge "Fix 6449259: FUL no longer overlaps music controls" into ...Brian Colonna2012-05-241-3/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix 6449259: FUL no longer overlaps music controls" into jb-devBrian Colonna2012-05-241-3/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix 6449259: FUL no longer overlaps music controlsBrian Colonna2012-05-231-3/+2
* | | | | | | am 77f79a39: am f927e17a: Use correct spell check localesatok2012-05-242-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f927e17a: Use correct spell check localesatok2012-05-242-2/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Use correct spell check localesatok2012-05-242-2/+5
* | | | | | | am 7c485c38: am 75ac4e84: Merge "Fix a bug with deferred position scrolling i...Adam Powell2012-05-233-6/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 75ac4e84: Merge "Fix a bug with deferred position scrolling in lists while...Adam Powell2012-05-233-6/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix a bug with deferred position scrolling in lists while data changes...Adam Powell2012-05-233-6/+16
| | |\ \ \ \ \
| | | * | | | | Fix a bug with deferred position scrolling in lists while data changesAdam Powell2012-05-233-6/+16
| | | |/ / / /
* | | | | | | am 1de7af86: am a587b890: Merge "ActivityChooser view not handling its remova...Svetoslav Ganov2012-05-231-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a587b890: Merge "ActivityChooser view not handling its removal and relayou...Svetoslav Ganov2012-05-231-3/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "ActivityChooser view not handling its removal and relayout properly." ...Svetoslav Ganov2012-05-231-3/+4
| | |\ \ \ \ \
| | | * | | | | ActivityChooser view not handling its removal and relayout properly.Svetoslav Ganov2012-05-231-3/+4
* | | | | | | | am a865d7d7: am df3633b3: Merge "Make it harder for apps to mess up ViewGroup...Romain Guy2012-05-233-15/+118
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am df3633b3: Merge "Make it harder for apps to mess up ViewGroup\'s internal ...Romain Guy2012-05-233-15/+118
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Make it harder for apps to mess up ViewGroup's internal state Bug #642...Romain Guy2012-05-233-15/+118
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |