summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 691be97f to gingerbread-plus-aospJean-Baptiste Queru2010-08-204-0/+310
|\
| * Merge "add new sensor types for handling gyro data and device orientation mor...Jean-Baptiste Queru2010-08-204-3/+312
| |\
| | * add new sensor types for handling gyro data and device orientationKevin Powell2010-08-194-3/+312
* | | am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
|\ \ \
| * \ \ am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
| |\ \ \
| | * | | Change CDMAPhone.getDeviceId to return MEID or ESN.Wink Saville2010-08-202-3/+8
* | | | | manual mergeJean-Baptiste Queru2010-08-204-16/+576
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXT...Jean-Baptiste Queru2010-08-204-16/+576
| |\ \ \ \
| | * | | | BluetoothHeadset.java:Herb Jellinek2010-08-134-16/+576
* | | | | | am d6f7f225: Merge "Load bitmaps in the correct format." into gingerbreadRomain Guy2010-08-201-0/+11
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Load bitmaps in the correct format." into gingerbreadRomain Guy2010-08-201-0/+11
| |\ \ \ \ \
| | * | | | | Load bitmaps in the correct format.Romain Guy2010-08-201-0/+11
* | | | | | | am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbreadKenny Root2010-08-2024-299/+2785
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge changes I8a257579,I82d16312 into gingerbreadKenny Root2010-08-2024-299/+2785
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add AStorageManager API to NDKKenny Root2010-08-203-1/+215
| | * | | | | Reorganize MountService IPCKenny Root2010-08-2021-298/+2570
* | | | | | | am 300b0b7e: Merge "setParamMaxFileDurationUs should allow zero time input as...Nipun Kwatra2010-08-201-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "setParamMaxFileDurationUs should allow zero time input as per API of s...Nipun Kwatra2010-08-201-1/+5
| |\ \ \ \ \ \
| | * | | | | | setParamMaxFileDurationUs should allow zero time input as per API of setMaxDu...Nipun Kwatra2010-08-201-1/+5
* | | | | | | | am 32519259: Merge "Fix a few small battery stats problems:" into gingerbreadDianne Hackborn2010-08-202-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix a few small battery stats problems:" into gingerbreadDianne Hackborn2010-08-202-2/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix a few small battery stats problems:Dianne Hackborn2010-08-202-2/+3
* | | | | | | | am 4d42ccd1: Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-202-3/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-202-3/+16
* | | | | | | | am 42f90ca5: Merge "Fix aapt dump badging to support xlarge screens." into gi...Dianne Hackborn2010-08-201-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix aapt dump badging to support xlarge screens." into gingerbreadDianne Hackborn2010-08-201-0/+9
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix aapt dump badging to support xlarge screens.Dianne Hackborn2010-08-201-0/+9
| | |/ / / / /
* | | | | | | am 6be23712: Merge "Free created FileMap when uncompressing files" into ginge...Kenny Root2010-08-201-5/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Free created FileMap when uncompressing files" into gingerbreadKenny Root2010-08-201-5/+9
| |\ \ \ \ \ \
| | * | | | | | Free created FileMap when uncompressing filesKenny Root2010-08-191-5/+9
* | | | | | | | am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableDa...Dianne Hackborn2010-08-201-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property no...Dianne Hackborn2010-08-201-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | DO NOT MERGE 2928156 Accessibility event's parcelableData property not nulli...Svetoslav Ganov2010-08-171-0/+1
* | | | | | | | | am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbreadRobert Greenwalt2010-08-207-6/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "DO NOT MERGE Fixing Connectivity" into gingerbreadRobert Greenwalt2010-08-207-6/+34
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | DO NOT MERGE Fixing ConnectivityRobert Greenwalt2010-08-207-6/+34
* | | | | | | | | am 39792d22: Fix bugs with granting permissions through onNewIntent().Dianne Hackborn2010-08-207-156/+357
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix bugs with granting permissions through onNewIntent().Dianne Hackborn2010-08-207-156/+357
* | | | | | | | | am b755e325: Merge "Only add 4 bytes offset for the output media buffer when ...James Dong2010-08-201-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Only add 4 bytes offset for the output media buffer when SPS is not re...James Dong2010-08-201-5/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Only add 4 bytes offset for the output media buffer when SPS is not received ...James Dong2010-08-191-5/+10
* | | | | | | | | | am 97a56269: Merge "Add camera fps range API." into gingerbreadWu-cheng Li2010-08-203-41/+160
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Add camera fps range API." into gingerbreadWu-cheng Li2010-08-203-41/+160
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add camera fps range API.Wu-cheng Li2010-08-203-41/+160
* | | | | | | | | | | am 581f7861: DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-202-95/+201
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-202-95/+201
* | | | | | | | | | | am b9a17931: Merge "SipSession: make potential time-consuming ops run on back...Hung-ying Tyan2010-08-201-27/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "SipSession: make potential time-consuming ops run on background thread...Hung-ying Tyan2010-08-201-27/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | SipSession: make potential time-consuming ops run on background threadHung-ying Tyan2010-08-201-27/+26
* | | | | | | | | | | | am 3f677b1b: Merge "Fix periodically disappearing status icons." into gingerb...Daniel Sandler2010-08-202-17/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /