Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of 691be97f to gingerbread-plus-aosp | Jean-Baptiste Queru | 2010-08-20 | 4 | -0/+310 |
|\ | |||||
| * | Merge "add new sensor types for handling gyro data and device orientation mor... | Jean-Baptiste Queru | 2010-08-20 | 4 | -3/+312 |
| |\ | |||||
| | * | add new sensor types for handling gyro data and device orientation | Kevin Powell | 2010-08-19 | 4 | -3/+312 |
* | | | am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. | Wink Saville | 2010-08-20 | 2 | -3/+8 |
|\ \ \ | |||||
| * \ \ | am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN. | Wink Saville | 2010-08-20 | 2 | -3/+8 |
| |\ \ \ | |||||
| | * | | | Change CDMAPhone.getDeviceId to return MEID or ESN. | Wink Saville | 2010-08-20 | 2 | -3/+8 |
* | | | | | 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 d6f7f225: Merge "Load bitmaps in the correct format." into gingerbread | Romain Guy | 2010-08-20 | 1 | -0/+11 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge "Load bitmaps in the correct format." into gingerbread | Romain Guy | 2010-08-20 | 1 | -0/+11 |
| |\ \ \ \ \ | |||||
| | * | | | | | Load bitmaps in the correct format. | Romain Guy | 2010-08-20 | 1 | -0/+11 |
* | | | | | | | am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread | Kenny Root | 2010-08-20 | 24 | -299/+2785 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge changes I8a257579,I82d16312 into gingerbread | Kenny Root | 2010-08-20 | 24 | -299/+2785 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Add AStorageManager API to NDK | Kenny Root | 2010-08-20 | 3 | -1/+215 |
| | * | | | | | Reorganize MountService IPC | Kenny Root | 2010-08-20 | 21 | -298/+2570 |
* | | | | | | | am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as... | Nipun Kwatra | 2010-08-20 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "setParamMaxFileDurationUs should allow zero time input as per API of s... | Nipun Kwatra | 2010-08-20 | 1 | -1/+5 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | setParamMaxFileDurationUs should allow zero time input as per API of setMaxDu... | Nipun Kwatra | 2010-08-20 | 1 | -1/+5 |
* | | | | | | | | 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 | 2 | -3/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Tracking merge of dalvik-dev to gingerbread | Brian Carlstrom | 2010-08-20 | 2 | -3/+16 |
* | | | | | | | | am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gi... | Dianne Hackborn | 2010-08-20 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Fix aapt dump badging to support xlarge screens." into gingerbread | Dianne Hackborn | 2010-08-20 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Fix aapt dump badging to support xlarge screens. | Dianne Hackborn | 2010-08-20 | 1 | -0/+9 |
| | |/ / / / / | |||||
* | | | | | | | am 6be23712: Merge "Free created FileMap when uncompressing files" into ginge... | Kenny Root | 2010-08-20 | 1 | -5/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Free created FileMap when uncompressing files" into gingerbread | Kenny Root | 2010-08-20 | 1 | -5/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Free created FileMap when uncompressing files | Kenny Root | 2010-08-19 | 1 | -5/+9 |
* | | | | | | | | 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 | 7 | -6/+34 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "DO NOT MERGE Fixing Connectivity" into gingerbread | Robert Greenwalt | 2010-08-20 | 7 | -6/+34 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| | * | | | | | | | DO NOT MERGE Fixing Connectivity | Robert Greenwalt | 2010-08-20 | 7 | -6/+34 |
* | | | | | | | | | am 39792d22: Fix bugs with granting permissions through onNewIntent(). | Dianne Hackborn | 2010-08-20 | 7 | -156/+357 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Fix bugs with granting permissions through onNewIntent(). | Dianne Hackborn | 2010-08-20 | 7 | -156/+357 |
* | | | | | | | | | am b755e325: Merge "Only add 4 bytes offset for the output media buffer when ... | James Dong | 2010-08-20 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Only add 4 bytes offset for the output media buffer when SPS is not re... | James Dong | 2010-08-20 | 1 | -5/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Only add 4 bytes offset for the output media buffer when SPS is not received ... | James Dong | 2010-08-19 | 1 | -5/+10 |
* | | | | | | | | | | am 97a56269: Merge "Add camera fps range API." into gingerbread | Wu-cheng Li | 2010-08-20 | 3 | -41/+160 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Add camera fps range API." into gingerbread | Wu-cheng Li | 2010-08-20 | 3 | -41/+160 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add camera fps range API. | Wu-cheng Li | 2010-08-20 | 3 | -41/+160 |
* | | | | | | | | | | | 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 b9a17931: Merge "SipSession: make potential time-consuming ops run on back... | Hung-ying Tyan | 2010-08-20 | 1 | -27/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "SipSession: make potential time-consuming ops run on background thread... | Hung-ying Tyan | 2010-08-20 | 1 | -27/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | SipSession: make potential time-consuming ops run on background thread | Hung-ying Tyan | 2010-08-20 | 1 | -27/+26 |
* | | | | | | | | | | | | am 3f677b1b: Merge "Fix periodically disappearing status icons." into gingerb... | Daniel Sandler | 2010-08-20 | 2 | -17/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |