Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix sp<> conversion operator / constructor | Mathias Agopian | 2011-02-25 | 3 | -8/+34 |
* | Merge "Implement issue #3426299: Introduce application "stopped" state" | Dianne Hackborn | 2011-02-25 | 11 | -37/+531 |
|\ | |||||
| * | Implement issue #3426299: Introduce application "stopped" state | Dianne Hackborn | 2011-02-25 | 11 | -37/+531 |
* | | Merge "ViewPropertyAnimator cancels prior animations" | Chet Haase | 2011-02-25 | 1 | -18/+49 |
|\ \ | |||||
| * | | ViewPropertyAnimator cancels prior animations | Chet Haase | 2011-02-25 | 1 | -18/+49 |
* | | | am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks ... | Andreas Huber | 2011-02-25 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync... | Andreas Huber | 2011-02-25 | 2 | -61/+153 |
| |\ \ \ | |||||
| | * \ \ | Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." int... | Andreas Huber | 2011-02-25 | 2 | -61/+153 |
| | |\ \ \ | |||||
| | | * | | | DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues. | Andreas Huber | 2011-02-25 | 2 | -61/+153 |
* | | | | | | Merge "Adding framework support for resizable widgets" | Adam Cohen | 2011-02-25 | 6 | -11/+127 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Adding framework support for resizable widgets | Adam Cohen | 2011-02-25 | 6 | -11/+127 |
* | | | | | | | Merge "Fixing the write of BackgroundData setting." | Robert Greenwalt | 2011-02-25 | 1 | -7/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixing the write of BackgroundData setting. | Robert Greenwalt | 2011-02-25 | 1 | -7/+5 |
* | | | | | | | | Revert "Binder linkage no longer depends on JNI objrefs as persistent tokens" | Christopher Tate | 2011-02-25 | 2 | -146/+52 |
* | | | | | | | | Merge "Fixing build" | Winson Chung | 2011-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixing build | Winson Chung | 2011-02-25 | 1 | -1/+1 |
* | | | | | | | | | Merge "Moving dependency includes out of librs headers." | Alex Sakhartchouk | 2011-02-25 | 4 | -29/+39 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Moving dependency includes out of librs headers. | Alex Sakhartchouk | 2011-02-25 | 4 | -29/+39 |
* | | | | | | | | | | Merge "Fixing issue where RemoteViewsService.onDestroy() was never being call... | Winson Chung | 2011-02-25 | 4 | -15/+100 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fixing issue where RemoteViewsService.onDestroy() was never being called. | Winson Chung | 2011-02-25 | 4 | -15/+100 |
* | | | | | | | | | | Merge "LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun me... | Xavier Ducrohet | 2011-02-25 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | LayoutLib: fix incorrect indices in one of the 2 native_drawTextRun methods. | Xavier Ducrohet | 2011-02-24 | 1 | -3/+2 |
* | | | | | | | | | | | Merge "Unset device trust state before unpairing." | Jaikumar Ganesh | 2011-02-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Unset device trust state before unpairing. | Jaikumar Ganesh | 2011-02-25 | 1 | -0/+2 |
* | | | | | | | | | | | Merge "Code clean-up around ScrollView." | Gilles Debunne | 2011-02-25 | 3 | -83/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Code clean-up around ScrollView. | Gilles Debunne | 2011-02-25 | 3 | -83/+55 |
* | | | | | | | | | | | | Merge "Removed ViewTreeObserver in TextView when handles are hidden" | Gilles Debunne | 2011-02-25 | 1 | -26/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Removed ViewTreeObserver in TextView when handles are hidden | Gilles Debunne | 2011-02-25 | 1 | -26/+6 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge "Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0" | David Li | 2011-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix mTexCoordsSlot > 0 check to mTexCoordsSlot >= 0 | David Li | 2011-02-25 | 1 | -1/+1 |
* | | | | | | | | | | | | | am 350799b7: am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_tele... | Samyeoul Choi | 2011-02-25 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | am 6c5d9a06: am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' f... | Samyeoul Choi | 2011-02-25 | 2 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 09223891: Crespo4G: Voicemail: Add \'config_telephony_...\' for Sprint | Samyeoul Choi | 2011-02-25 | 2 | -1/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Crespo4G: Voicemail: Add 'config_telephony_...' for Sprint | Samyeoul Choi | 2011-02-25 | 2 | -1/+11 |
* | | | | | | | | | | | | | | | am dc365a36: Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plu... | Svetoslav Ganov | 2011-02-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp" into ... | Svetoslav Ganov | 2011-02-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp | Svetoslav Ganov | 2011-02-25 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | am 9e5b1a49: Merge "Use different version of CLDR data in DatePicker" into gi... | Svetoslav Ganov | 2011-02-25 | 1 | -6/+33 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | Merge "Use different version of CLDR data in DatePicker" into gingerbread | Svetoslav Ganov | 2011-02-24 | 1 | -6/+33 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | Use different version of CLDR data in DatePicker | Svetoslav Ganov | 2011-02-24 | 1 | -6/+33 |
* | | | | | | | | | | | | | | | | | Merge "mp4a box contains mp3 audio when the object type indication is 0x6b" | James Dong | 2011-02-25 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | mp4a box contains mp3 audio when the object type indication is 0x6b | James Dong | 2011-02-25 | 1 | -0/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge "Import revised translations." | Eric Fischer | 2011-02-25 | 40 | -83/+83 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Import revised translations. | Eric Fischer | 2011-02-25 | 40 | -83/+83 |
* | | | | | | | | | | | | | | | | | | am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO N... | Eric Fischer | 2011-02-25 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb | Eric Fischer | 2011-02-25 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb | Eric Fischer | 2011-02-25 | 2 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Import revised translations. DO NOT MERGE | Eric Fischer | 2011-02-25 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | Merge "Make sure pinch zoom and overview scale are within limits" | Shimeng (Simon) Wang | 2011-02-25 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Make sure pinch zoom and overview scale are within limits | Shimeng (Simon) Wang | 2011-02-24 | 1 | -2/+4 |