summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Merge "Modified libdrm to support SuperH platform"Jeff Hamilton2010-05-142-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Modified libdrm to support SuperH platformShin-ichiro KAWASAKI2009-07-032-1/+5
* | | | | | | | | | | am 5f1beda1: Merge "Make the SSID field of WifiConfiguration consistent with ...Chung-yih Wang2010-05-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Make the SSID field of WifiConfiguration consistent with API descripti...Chung-yih Wang2010-05-141-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make the SSID field of WifiConfiguration consistent with API description.Chung-yih Wang2010-05-151-2/+2
* | | | | | | | | | | | am aa77de13: Fix issue #2686193: Can\'t move apps to SD cardDianne Hackborn2010-05-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Fix issue #2686193: Can't move apps to SD cardDianne Hackborn2010-05-141-2/+2
* | | | | | | | | | | | am d1e9d590: Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-143-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Doc change: add sizes/sums for sdk/ndk/adt packages.Dirk Dougherty2010-05-143-14/+14
| |/ / / / / / / / / /
* | | | | | | | | | | am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample t...Andreas Huber2010-05-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix sampleTable instantiation, this makes sure that the sample table refers t...Andreas Huber2010-05-141-1/+2
* | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Only hold a weak pointer on SurfaceComposerClients"Jean-Baptiste Queru2010-05-141-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Only hold a weak pointer on SurfaceComposerClientsMatt Fischer2010-04-071-4/+4
* | | | | | | | | | | | am 826c9f77: docs: fix broken link, reduce API info about backup and point to...Scott Main2010-05-141-17/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | docs: fix broken link, reduce API info about backup and point to dev guideScott Main2010-05-141-17/+5
* | | | | | | | | | | | am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyoDirk Dougherty2010-05-141-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Doc change: adjust compatibility doc." into froyoDirk Dougherty2010-05-141-9/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Doc change: adjust compatibility doc.Dirk Dougherty2010-05-141-9/+2
* | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge "SetLocaleByCarrier, only if its not an unknown carrier."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | SetLocaleByCarrier, only if its not an unknown carrier.Jey2010-04-161-1/+1
* | | | | | | | | | | | | | am 59cfe713: Merge "Doc change: adjustments to the api changes description" i...Dirk Dougherty2010-05-141-17/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Doc change: adjustments to the api changes description" into froyoDirk Dougherty2010-05-141-17/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: adjustments to the api changes descriptionDirk Dougherty2010-05-141-17/+12
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | am bba70cdb: Merge "Doc change: add note about future instruction set support...Dirk Dougherty2010-05-141-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Doc change: add note about future instruction set support." into froyoDirk Dougherty2010-05-141-2/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: add note about future instruction set support.Dirk Dougherty2010-05-141-2/+8
| | |/ / / / / / / / / / / /
* | | | | | | | | | | | | | am 89969d4c: Merge "Doc change: documentation for library projects in sdk." i...Dirk Dougherty2010-05-145-20/+811
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Doc change: documentation for library projects in sdk." into froyoDirk Dougherty2010-05-145-20/+811
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Doc change: documentation for library projects in sdk.Dirk Dougherty2010-05-145-20/+811
* | | | | | | | | | | | | | | am b83a283a: docs: add dev guide for backupScott Main2010-05-144-16/+791
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | docs: add dev guide for backupScott Main2010-05-144-16/+791
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
* | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Put the wifi status icon in the right place."Joe Onorato2010-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Put the wifi status icon in the right place.Steve Kondik2010-03-281-1/+1
| * | | | | | | | | | | | | | Merge "Corrected debug message in WindowManager"Dianne Hackborn2010-05-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Corrected debug message in WindowManagerJohan Alfven2010-05-121-1/+1
* | | | | | | | | | | | | | | | am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into...Dirk Dougherty2010-05-131-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge "Doc change: adjustments for ndk feature description" into froyoDirk Dougherty2010-05-131-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Doc change: adjustments for ndk feature descriptionDirk Dougherty2010-05-131-3/+4
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am a0711e7b: Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Doc change: Add compatibility article.Dirk Dougherty2010-05-133-34/+294
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling p...Suchi Amalapurapu2010-05-132-3/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge "Fix 2672155 Check the code path when enabling disabling packages." int...Suchi Amalapurapu2010-05-132-3/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Fix 2672155Suchi Amalapurapu2010-05-132-3/+49
* | | | | | | | | | | | | | | | merge from open-source masterThe Android Open Source Project2010-05-134-2/+298
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |