summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Improve clip support (add intersect, union and replace.)Romain Guy2010-07-162-18/+21
* Merge "Fixing NPE in CursorLoader"Dmitri Plotnikov2010-07-151-1/+3
|\
| * Fixing NPE in CursorLoaderDmitri Plotnikov2010-07-151-1/+3
* | Merge "fix a bug where some accounts changed listeners don't see the new vers...Fred Quintana2010-07-151-16/+16
|\ \ | |/ |/|
| * fix a bug where some accounts changed listeners don't see the newFred Quintana2010-07-151-16/+16
* | Merge "Fix Emulator boot."Robert Greenwalt2010-07-151-2/+2
|\ \
| * | Fix Emulator boot.Robert Greenwalt2010-07-151-2/+2
* | | Merge "Handle Input and network signal changes for HID and tethering."Jaikumar Ganesh2010-07-152-3/+15
|\ \ \
| * | | Handle Input and network signal changes for HID and tethering.Jaikumar Ganesh2010-07-152-3/+15
| |/ /
* | | Merge "Add support for BitmapShader."Romain Guy2010-07-152-1/+57
|\ \ \
| * | | Add support for BitmapShader.Romain Guy2010-07-152-1/+57
* | | | Fix bug where loader listener would be registered twice.Dianne Hackborn2010-07-153-58/+89
| |/ / |/| |
* | | am 203ec9fa: am d6343c26: Merge "Interface support for custom HTTP headers in...Steve Howard2010-07-152-2/+31
|\ \ \
| * \ \ am d6343c26: Merge "Interface support for custom HTTP headers in DL manager" ...Steve Howard2010-07-152-2/+31
| |\ \ \
| | * \ \ Merge "Interface support for custom HTTP headers in DL manager" into gingerbreadSteve Howard2010-07-152-2/+31
| | |\ \ \
| | | * | | Interface support for custom HTTP headers in DL managerSteve Howard2010-07-152-2/+31
* | | | | | am 4fd41688: am 5352d237: am 38137d7a: Merge "docs: lots of additions to the ...Scott Main2010-07-151-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5352d237: am 38137d7a: Merge "docs: lots of additions to the resources doc...Scott Main2010-07-151-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 38137d7a: Merge "docs: lots of additions to the resources docs new drawabl...Scott Main2010-07-151-1/+3
| | |\ \ \ \
| | | * \ \ \ Merge "docs: lots of additions to the resources docs new drawable resources a...Scott Main2010-07-151-1/+3
| | | |\ \ \ \
| | | | * | | | docs: lots of additions to the resources docsScott Main2010-06-211-1/+3
* | | | | | | | am a6be4e01: am 3a053db2: Merge "The ICU data is no longer compiled directly ...Joe Onorato2010-07-151-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3a053db2: Merge "The ICU data is no longer compiled directly into the shar...Joe Onorato2010-07-151-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "The ICU data is no longer compiled directly into the shared library." ...Joe Onorato2010-07-151-1/+0
| | |\ \ \ \ \ \
| | | * | | | | | The ICU data is no longer compiled directly into the shared library.Joe Onorato2010-07-131-1/+0
* | | | | | | | | Merge "checkpoint tablet status bar"Joe Onorato2010-07-152-1/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkpoint tablet status barJoe Onorato2010-07-122-1/+28
* | | | | | | | | | Add various properties to View to allow it to be moved, scaled, faded, and ro...Chet Haase2010-07-152-38/+719
* | | | | | | | | | Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect ...Fabrice Di Meglio2010-07-151-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix bug #2793828 (Sync/visible setting on the phone should not affect what's ...Fabrice Di Meglio2010-07-081-0/+1
* | | | | | | | | | | Merge "SQLiteDatabase: Add mechanism for registering custom sqlite3 functions"Mike Lockwood2010-07-152-6/+132
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SQLiteDatabase: Add mechanism for registering custom sqlite3 functionsMike Lockwood2010-07-142-6/+132
* | | | | | | | | | | | am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when...Andrew Stadler2010-07-141-6/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecu...Andrew Stadler2010-07-141-6/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 468c82e4: Merge "Skip hostname verification when using insecure factory" i...Andrew Stadler2010-07-141-6/+15
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Skip hostname verification when using insecure factoryAndrew Stadler2010-07-121-6/+15
| | | * | | | | | | | | Merge "Doc change: Add revision notes for Android 2.2_r2 development platform...Dirk Dougherty2010-07-071-6/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Doc change: Add revision notes for Android 2.2_r2 development platform. Fix s...Dirk Dougherty2010-07-021-6/+6
| * | | | | | | | | | | | am ed86eaa7: Merge "Argh oops I didn\'t mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Argh oops I didn't mean to delete this." into gingerbreadDianne Hackborn2010-07-141-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
| | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | resolved conflicts for merge of e03952c0 to masterJim Miller2010-07-145-22/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 9d42c7f7: Merge "Fix 2797185: Re-enable thumbnail generation in framework"...Jim Miller2010-07-145-22/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Fix 2797185: Re-enable thumbnail generation in framework" into gingerb...Jim Miller2010-07-145-22/+94
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Fix 2797185: Re-enable thumbnail generation in frameworkJim Miller2010-07-135-22/+94
* | | | | | | | | | | | | Argh oops I didn't mean to delete this.Dianne Hackborn2010-07-141-0/+3
* | | | | | | | | | | | | Merge "Bug 2841148 - Add accessors for action bar context mode state."Adam Powell2010-07-143-0/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Bug 2841148 - Add accessors for action bar context mode state.Adam Powell2010-07-143-0/+44
* | | | | | | | | | | | | am 50576fa8: merge from open-source masterThe Android Open Source Project2010-07-141-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-07-141-2/+3
| |\ \ \ \ \ \ \ \ \ \ \