summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am 44e39d60: Merge remote branch \'goog/honeycomb-mr2\' into honeycomb-LTEThe Android Automerger2011-05-091-1/+3
|\
| * Merge remote branch 'goog/honeycomb-mr2' into honeycomb-LTEThe Android Automerger2011-05-081-1/+3
| |\
| | * DO NOT MERGE: Don't send pause again when coming back from full screenTeng-Hui Zhu2011-05-051-1/+3
| | * DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-031-0/+7
| | * DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-032-0/+55
* | | am f13eb830: Merge "Add auto-restore timeout for secondary networks." into ho...Robert Greenwalt2011-05-041-1/+9
|\ \ \ | |/ /
| * | Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTERobert Greenwalt2011-05-041-1/+9
| |\ \
| | * | Add auto-restore timeout for secondary networks.Robert Greenwalt2011-05-031-1/+9
* | | | am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage...Mike Lockwood2011-05-041-0/+7
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-041-0/+7
* | | | am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeSt...Mike Lockwood2011-05-042-0/+55
|\ \ \ \ | |/ / /
| * | | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-042-0/+55
* | | | am eac835e5: am 9c4ba258: Merge "Removing dead store; it was likely a relict ...Conley Owens2011-05-031-1/+0
|\ \ \ \
| * \ \ \ Merge "Removing dead store; it was likely a relict of debuging code."Conley Owens2011-05-021-1/+0
| |\ \ \ \
| | * | | | Removing dead store; it was likely a relict of debuging code.Jozef BABJAK2011-04-291-1/+0
* | | | | | am d0d44c4e: Merge "Make DataConnection asynchronous." into honeycomb-LTEWink Saville2011-05-021-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Make DataConnection asynchronous." into honeycomb-LTEWink Saville2011-05-021-0/+1
| |\ \ \ \ \
| | * | | | | Make DataConnection asynchronous.Wink Saville2011-05-021-0/+1
| | | |_|/ / | | |/| | |
* | | | | | am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycom...Robert Greenwalt2011-05-024-28/+222
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTERobert Greenwalt2011-05-024-28/+222
| |\ \ \ \ \
| | * | | | | Add RouteInfo objects for tracking routes.Robert Greenwalt2011-05-024-28/+222
* | | | | | | am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into hon...Irfan Sheriff2011-05-022-0/+363
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTEIrfan Sheriff2011-05-022-0/+363
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add DhcpStateMachine for interation with dhcpcdIrfan Sheriff2011-04-302-0/+363
* | | | | | | am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTEWink Saville2011-05-022-59/+164
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Enhance AsyncChannel.Wink Saville2011-05-022-59/+164
* | | | | | | Merged "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-292-5/+23
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Adjust mBiggerTouchSlopSquare to the suitable value"Conley Owens2011-04-292-5/+23
| |\ \ \ \ \ \
| | * | | | | | Adjust mBiggerTouchSlopSquare to the suitable valueMasanori Ogino2011-02-072-5/+23
* | | | | | | | Merge commit 'b737647d' (Scrolling using arrow keys with padding) into mConley Owens2011-04-291-4/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Scolling using arrow keys with padding"Conley Owens2011-04-291-4/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Scolling using arrow keys with paddingMattias Petersson2011-04-071-4/+2
* | | | | | | | | am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null str...Conley Owens2011-04-291-3/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "CHAR_SEQUENCE_CREATOR cannot handle null string"Conley Owens2011-04-291-3/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | CHAR_SEQUENCE_CREATOR cannot handle null stringMartin Wallgren2011-04-071-3/+9
| | |/ / / / / / /
* | | | | | | | | am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because...Conley Owens2011-04-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix startSearch condition on Dialog, because pressing search key cause...Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix startSearch condition on Dialog, because pressing search key causes ANR p...lge-aosp2011-03-151-1/+1
* | | | | | | | | | am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in re...Conley Owens2011-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Adding a sanity test in the while loop in readHistory()"Conley Owens2011-04-291-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Adding a sanity test in the while loop in readHistory()Per Andersson2011-02-211-1/+1
* | | | | | | | | | am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for Pr...Scott Main2011-04-291-13/+75
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" in...Scott Main2011-04-291-13/+75
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| | |\ \ \ \ \ \ \
| | | * | | | | | | docs: more documentation for ProgressBarScott Main2011-04-291-13/+75
* | | | | | | | | | am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyD...Conley Owens2011-04-291-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Added null check on return value for getKeyDispatcherState()"Conley Owens2011-04-281-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added null check on return value for getKeyDispatcherState()Per Andersson2011-04-281-0/+4
* | | | | | | | | | | am 8b22ef66: am e41d2aed: Merge "Using robust equality check."Conley Owens2011-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Using robust equality check."Conley Owens2011-04-281-1/+1
| |\ \ \ \ \ \ \ \ \ \