summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 703e5d3c: StrictMode: avoid an allocation in common caseBrad Fitzpatrick2010-07-152-9/+31
|\
| * StrictMode: avoid an allocation in common caseBrad Fitzpatrick2010-07-152-9/+31
* | am 0c36c96f: Merge "StrictMode: batch drop box writes for system apps" into g...Brad Fitzpatrick2010-07-151-1/+3
|\ \ | |/
| * Merge "StrictMode: batch drop box writes for system apps" into gingerbreadBrad Fitzpatrick2010-07-151-1/+3
| |\
| | * StrictMode: batch drop box writes for system appsBrad Fitzpatrick2010-07-151-1/+3
* | | am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder ...Brad Fitzpatrick2010-07-155-46/+277
|\ \ \ | |/ /
| * | Merge "StrictMode: gather and return violating stacks in Binder replies" into...Brad Fitzpatrick2010-07-155-46/+277
| |\ \ | | |/
| | * StrictMode: gather and return violating stacks in Binder repliesBrad Fitzpatrick2010-07-155-46/+277
* | | am c4b204bd: Merge "More StrictMode work, keeping Binder & BlockGuard\'s thre...Brad Fitzpatrick2010-07-153-2/+142
|\ \ \ | |/ /
| * | Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-s...Brad Fitzpatrick2010-07-153-2/+142
| |\ \ | | |/
| | * More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync.Brad Fitzpatrick2010-07-153-2/+142
* | | am 2c40582a: Merge "Add native C APIs for working with the Asset Manager" int...Christopher Tate2010-07-153-6/+13
|\ \ \ | |/ /
| * | Add native C APIs for working with the Asset ManagerChristopher Tate2010-07-153-6/+13
| |/
* | 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 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 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
* | | | | | 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
| | | |_|_|_|/ | | |/| | | |
* | | | | | | 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
* | | | | | | merge from open-source masterThe Android Open Source Project2010-07-141-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Start app with several activities with intent filter [Main, Launcher] was brokenJohan Erlandsson2010-07-131-2/+3
* | | | | | | | am 05940b2c: Merge "Download manager support for file URIs + last modified ti...Steve Howard2010-07-142-12/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge "Download manager support for file URIs + last modified time" into ging...Steve Howard2010-07-142-12/+20
| |\ \ \ \ \ \ \
| | * | | | | | | Download manager support for file URIs + last modified timeSteve Howard2010-07-132-12/+20
* | | | | | | | | am 021e906a: Merge "Fix docs build." into gingerbreadDianne Hackborn2010-07-131-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix docs build.Dianne Hackborn2010-07-131-1/+1
* | | | | | | | | am d76b67c3: IME events are now dispatched to native applications.Dianne Hackborn2010-07-138-71/+486
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | IME events are now dispatched to native applications.Dianne Hackborn2010-07-138-71/+486
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | am fd035829: Add initial gamepad support.Jeff Brown2010-07-132-0/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add initial gamepad support.Jeff Brown2010-07-132-0/+31
* | | | | | | | am c0a7e690: Add Parcel::readExceptionCode() and Parcel::writeNoException()Brad Fitzpatrick2010-07-131-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add Parcel::readExceptionCode() and Parcel::writeNoException()Brad Fitzpatrick2010-07-131-1/+1
| |/ / / / / /
* | | | | | | am b8d890eb: Merge "Initial implementation of the download manager public API...Steve Howard2010-07-133-0/+741
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Initial implementation of the download manager public API.Steve Howard2010-07-133-0/+741
| | |_|_|/ / | |/| | | |
* | | | | | merge from open-source masterThe Android Open Source Project2010-07-131-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |