summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called...Chih-Chung Chang2010-08-251-10/+20
|\
| * Avoid allocating buffer every time getThumbnail is called.Chih-Chung Chang2010-08-251-10/+20
* | am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbreadDaisuke Miyakawa2010-08-245-107/+45
|\ \ | |/
| * Merge "Fix the test breakage in vCard tests." into gingerbreadDaisuke Miyakawa2010-08-245-107/+45
| |\
| | * Fix the test breakage in vCard tests.Daisuke Miyakawa2010-08-245-107/+45
* | | am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerb...Dianne Hackborn2010-08-241-0/+7
|\ \ \ | |/ /
| * | Merge "Verify that onPause() calls its superclass." into gingerbreadDianne Hackborn2010-08-241-0/+7
| |\ \ | | |/ | |/|
| | * Verify that onPause() calls its superclass.Dianne Hackborn2010-08-241-0/+7
* | | am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbreadGilles Debunne2010-08-241-4/+6
|\ \ \ | |/ /
| * | Merge "Fix for an NPE in TextView." into gingerbreadGilles Debunne2010-08-241-4/+6
| |\ \
| | * | Fix for an NPE in TextView.Gilles Debunne2010-08-241-4/+6
| | |/
* | | am b1bbe99a: Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-242-7/+39
|\ \ \ | |/ /
| * | Merge "Some StrictMode API changes." into gingerbreadBrad Fitzpatrick2010-08-242-7/+39
| |\ \
| | * | Some StrictMode API changes.Brad Fitzpatrick2010-08-242-7/+39
| | |/
* | | am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerb...Daisuke Miyakawa2010-08-241-1/+3
|\ \ \ | |/ /
| * | Merge "Fix vCard so that it looks at IM correctly." into gingerbreadDaisuke Miyakawa2010-08-241-1/+3
| |\ \
| | * | Fix vCard so that it looks at IM correctly.Daisuke Miyakawa2010-08-241-1/+3
* | | | am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbreadDaisuke Miyakawa2010-08-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Make VCardTestsBase public." into gingerbreadDaisuke Miyakawa2010-08-241-1/+1
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Make VCardTestsBase public.Daisuke Miyakawa2010-08-231-1/+1
* | | am 2703a42d: When an EditText gains focus by tapping, move the insertion poin...Gilles Debunne2010-08-242-20/+10
|\ \ \ | |/ /
| * | When an EditText gains focus by tapping, move the insertion point where tapped.Gilles Debunne2010-08-242-20/+10
* | | am d132892a: Merge "Don\'t touch the VFS during window relayout." into ginger...Brad Fitzpatrick2010-08-231-30/+35
|\ \ \ | |/ /
| * | Don't touch the VFS during window relayout.Brad Fitzpatrick2010-08-231-30/+35
* | | am 3e05a0be: Hysteresis effect in Text selection.Gilles Debunne2010-08-232-39/+63
|\ \ \ | |/ /
| * | Hysteresis effect in Text selection.Gilles Debunne2010-08-232-39/+63
| |/
| * Merge "add new sensor types for handling gyro data and device orientation mor...Mathias Agopian2010-08-233-0/+230
| |\
| | * add new sensor types for handling gyro data and device orientationKevin Powell2010-08-203-0/+230
* | | resolved conflicts for merge of 1ffd753e to gingerbread-plus-aospJean-Baptiste Queru2010-08-231-1/+1
|\ \ \
| * \ \ Merge "Crash when powering off."Jean-Baptiste Queru2010-08-231-0/+4
| |\ \ \
| | * | | Crash when powering off.Mathias Jeppsson2010-08-171-0/+4
* | | | | am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerb...Steve Howard2010-08-201-5/+7
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Make ProgressBar.setVisibility() remotable." into gingerbreadSteve Howard2010-08-201-5/+7
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Make ProgressBar.setVisibility() remotable.Steve Howard2010-08-201-5/+7
* | | | | resolved conflicts for merge of e7731f0a to gingerbread-plus-aospJean-Baptiste Queru2010-08-201-10/+34
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Added overload methods for DatabaseUtils.queryNumEntriesChristian Mehlmauer2010-08-201-10/+34
* | | | | am ec58dff0: Fix build - remove dead doc linkJean-Baptiste Queru2010-08-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix build - remove dead doc linkJean-Baptiste Queru2010-08-201-1/+1
* | | | | resolved conflicts for merge of 691be97f to gingerbread-plus-aospJean-Baptiste Queru2010-08-203-0/+230
|\ \ \ \ \ | |/ / / /
| * | | | Merge "add new sensor types for handling gyro data and device orientation mor...Jean-Baptiste Queru2010-08-203-2/+231
| |\ \ \ \
| | * | | | add new sensor types for handling gyro data and device orientationKevin Powell2010-08-193-2/+231
* | | | | | 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 06c81f29: Merge changes I8a257579,I82d16312 into gingerbreadKenny Root2010-08-208-294/+1476
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge changes I8a257579,I82d16312 into gingerbreadKenny Root2010-08-208-294/+1476
| |\ \ \ \ \ \
| | * | | | | | Reorganize MountService IPCKenny Root2010-08-208-294/+1476
* | | | | | | | 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