Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerb... | Steve Howard | 2010-08-20 | 1 | -5/+7 |
|\ | |||||
| * | Merge "Make ProgressBar.setVisibility() remotable." into gingerbread | Steve Howard | 2010-08-20 | 1 | -5/+7 |
| |\ | |||||
| | * | Make ProgressBar.setVisibility() remotable. | Steve Howard | 2010-08-20 | 1 | -5/+7 |
* | | | resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-08-20 | 1 | -10/+34 |
|\ \ \ | |||||
| * | | | Added overload methods for DatabaseUtils.queryNumEntries | Christian Mehlmauer | 2010-08-20 | 1 | -10/+34 |
* | | | | am ec58dff0: Fix build - remove dead doc link | Jean-Baptiste Queru | 2010-08-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix build - remove dead doc link | Jean-Baptiste Queru | 2010-08-20 | 1 | -1/+1 |
* | | | | resolved conflicts for merge of 691be97f to gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-08-20 | 3 | -0/+230 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge "add new sensor types for handling gyro data and device orientation mor... | Jean-Baptiste Queru | 2010-08-20 | 3 | -2/+231 |
| |\ \ \ | |||||
| | * | | | add new sensor types for handling gyro data and device orientation | Kevin Powell | 2010-08-19 | 3 | -2/+231 |
* | | | | | manual merge | Jean-Baptiste Queru | 2010-08-20 | 4 | -16/+576 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXT... | Jean-Baptiste Queru | 2010-08-20 | 4 | -16/+576 |
| |\ \ \ \ | |||||
| | * | | | | BluetoothHeadset.java: | Herb Jellinek | 2010-08-13 | 4 | -16/+576 |
* | | | | | | am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread | Kenny Root | 2010-08-20 | 8 | -294/+1476 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge changes I8a257579,I82d16312 into gingerbread | Kenny Root | 2010-08-20 | 8 | -294/+1476 |
| |\ \ \ \ \ | |||||
| | * | | | | | Reorganize MountService IPC | Kenny Root | 2010-08-20 | 8 | -294/+1476 |
* | | | | | | | am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread | Dianne Hackborn | 2010-08-20 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix a few small battery stats problems:" into gingerbread | Dianne Hackborn | 2010-08-20 | 2 | -2/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix a few small battery stats problems: | Dianne Hackborn | 2010-08-20 | 2 | -2/+3 |
* | | | | | | | | am 4d42ccd1: Tracking merge of dalvik-dev to gingerbread | Brian Carlstrom | 2010-08-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Tracking merge of dalvik-dev to gingerbread | Brian Carlstrom | 2010-08-20 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableDa... | Dianne Hackborn | 2010-08-20 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property no... | Dianne Hackborn | 2010-08-20 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | DO NOT MERGE 2928156 Accessibility event's parcelableData property not nulli... | Svetoslav Ganov | 2010-08-17 | 1 | -0/+1 |
* | | | | | | | | am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread | Robert Greenwalt | 2010-08-20 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "DO NOT MERGE Fixing Connectivity" into gingerbread | Robert Greenwalt | 2010-08-20 | 2 | -0/+16 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | DO NOT MERGE Fixing Connectivity | Robert Greenwalt | 2010-08-20 | 2 | -0/+16 |
* | | | | | | | | am 39792d22: Fix bugs with granting permissions through onNewIntent(). | Dianne Hackborn | 2010-08-20 | 1 | -8/+10 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix bugs with granting permissions through onNewIntent(). | Dianne Hackborn | 2010-08-20 | 1 | -8/+10 |
* | | | | | | | | am 97a56269: Merge "Add camera fps range API." into gingerbread | Wu-cheng Li | 2010-08-20 | 1 | -11/+116 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Add camera fps range API." into gingerbread | Wu-cheng Li | 2010-08-20 | 1 | -11/+116 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Add camera fps range API. | Wu-cheng Li | 2010-08-20 | 1 | -11/+116 |
| | |/ / / / / / | |||||
* | | | | | | | | am 581f7861: DO NOT MERGE Refactor find and select dialogs | Cary Clark | 2010-08-20 | 2 | -95/+201 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | DO NOT MERGE Refactor find and select dialogs | Cary Clark | 2010-08-20 | 2 | -95/+201 |
* | | | | | | | | am 2f6d975b: Minor MotionEvent optimization. | Jeff Brown | 2010-08-19 | 1 | -29/+34 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Minor MotionEvent optimization. | Jeff Brown | 2010-08-19 | 1 | -29/+34 |
* | | | | | | | | am d3aaad0e: Merge "Use getMinFrameCount() instead of querying AudioSystem di... | Chia-chi Yeh | 2010-08-19 | 2 | -43/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Use getMinFrameCount() instead of querying AudioSystem directly." into... | Chia-chi Yeh | 2010-08-19 | 2 | -43/+20 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use getMinFrameCount() instead of querying AudioSystem directly. | Chia-chi Yeh | 2010-08-19 | 2 | -43/+20 |
* | | | | | | | | | am d018a0ce: Merge "Text selection without trackball." into gingerbread | Gilles Debunne | 2010-08-19 | 34 | -588/+1047 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Text selection without trackball." into gingerbread | Gilles Debunne | 2010-08-19 | 34 | -588/+1047 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Text selection without trackball. | Gilles Debunne | 2010-08-19 | 34 | -588/+1047 |
* | | | | | | | | | | am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutor... | Scott Main | 2010-08-19 | 22 | -0/+66 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo | Scott Main | 2010-08-19 | 22 | -0/+66 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | docs: add links from widget classes to tutorials | Scott Main | 2010-08-19 | 22 | -0/+66 |
* | | | | | | | | | | | am 189de282: Merge "Fix for a Resource system bug that displayed the wrong na... | Gilles Debunne | 2010-08-19 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Fix for a Resource system bug that displayed the wrong name for missin... | Gilles Debunne | 2010-08-19 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix for a Resource system bug that displayed the wrong name for missing asset. | Gilles Debunne | 2010-08-19 | 1 | -3/+1 |
| | | |/ / / / / / / / | | |/| | | | | | | | | |||||
* | | | | | | | | | | | am 18ef3725: DO NOT MERGE. Fix the build. | Romain Guy | 2010-08-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | DO NOT MERGE. Fix the build. | Romain Guy | 2010-08-19 | 1 | -1/+2 |