summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implement the GL11ExtensionPack APIs.Jack Palevich2010-01-287-127/+1130
* Updating Android's API XML files to reflect our new XML APIs!Jesse Wilson2010-01-272-70/+8865
* Merge "Added OverScroller and overscroll effects for ScrollView and Horizonta...Romain Guy2010-01-273-68/+394
|\
| * Added OverScroller and overscroll effects for ScrollView and HorizontalScroll...Adam Powell2010-01-273-68/+394
* | am 6f3e1e27: am 9a400fa4: Merge "initialize sync adapters that get installed ...Fred Quintana2010-01-271-0/+9
|\ \
| * \ am 9a400fa4: Merge "initialize sync adapters that get installed while the sys...Fred Quintana2010-01-211-0/+9
| |\ \
| | * \ Merge "initialize sync adapters that get installed while the system is runnin...Fred Quintana2010-01-211-0/+9
| | |\ \
| | | * | initialize sync adapters that get installed while the system is runningFred Quintana2010-01-211-0/+9
* | | | | am 3c2d3667: am 036e2108: Fix NPE when importing from USIM.jsh2010-01-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 036e2108: Fix NPE when importing from USIM.jsh2010-01-211-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix NPE when importing from USIM.jsh2010-01-211-1/+1
* | | | | Bite the bullet and add support for multiple device admins.Dianne Hackborn2010-01-276-75/+135
* | | | | am 47f1d4d5: am b1780474: Merge "Instead of caputre the memory footprint befo...Yu Shan Emily Lau2010-01-271-39/+17
|\ \ \ \ \ | |/ / / /
| * | | | am b1780474: Merge "Instead of caputre the memory footprint before and after ...Yu Shan Emily Lau2010-01-211-39/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge "Instead of caputre the memory footprint before and after the test. We ...Yu Shan Emily Lau2010-01-211-39/+17
| | |\ \ \
| | | * | | Instead of caputre the memory footprint before and after the test. We would l...Yu Shan Emily Lau2010-01-211-39/+17
* | | | | | am ad0e5363: am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-2720-0/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 50adb167: Pull in "emergency calls only" translations.Eric Fischer2010-01-2120-0/+20
| |\ \ \ \ \ | | |/ / / /
| | * | | | Pull in "emergency calls only" translations.Eric Fischer2010-01-2120-0/+20
* | | | | | am 97fdd0ab: am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-271-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7f70998d: Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-211-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add Emergency Calls Only String." into eclairJohn Wang2010-01-211-0/+2
| | |\ \ \ \
| | | * | | | Add Emergency Calls Only String.John Wang2010-01-211-0/+2
* | | | | | | Unhide camera api for set display orientation.Chih-Chung Chang2010-01-272-2/+15
* | | | | | | am 29bc7270: am 495bae67: Merge "fix bug 2264186: clean up the outstanding as...Wei Huang2010-01-271-21/+74
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries i...Wei Huang2010-01-211-21/+74
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "fix bug 2264186: clean up the outstanding async queries in ContactHead...Wei Huang2010-01-211-21/+74
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.Wei Huang2010-01-211-21/+74
* | | | | | | Merge "Fix http streaming for shoutcast servers that do not support http rang...Andreas Huber2010-01-272-9/+31
|\ \ \ \ \ \ \
| * | | | | | | Fix http streaming for shoutcast servers that do not support http ranges.Andreas Huber2010-01-272-9/+31
* | | | | | | | resolved conflicts for merge of 176a88ff to masterRomain Guy2010-01-272-2/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | merge from open-source masterThe Android Open Source Project2010-01-214-5/+14
| |\ \ \ \ \ \ \
| | * | | | | | | LocationManagerService: Fix bug removing proximity alerts.Mike Lockwood2010-01-191-3/+1
| | * | | | | | | ViewAnimator.setAnimateFirstView() doesn't work for out-animation.NoraBora2010-01-181-2/+3
| | * | | | | | | Fix the build.Romain Guy2009-12-301-3/+4
| | * | | | | | | guess default mMaxHeight but allow layout to override this.NoraBora2009-12-301-0/+8
| | * | | | | | | setThumbOffset was missing in the previous merge.NoraBora2009-12-221-0/+1
* | | | | | | | | Merge "New View.dispatchDisplayHint() API. Bug #2399147"Romain Guy2010-01-275-3/+98
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New View.dispatchDisplayHint() API.Romain Guy2010-01-275-3/+98
* | | | | | | | | | am 6efe03b1: am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs."...Ying Wang2010-01-271-3/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | am 6f9e2c64: Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-211-3/+9
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Find layout classes in all "layout-*" dirs." into eclairYing Wang2010-01-211-3/+9
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Find layout classes in all "layout-*" dirs.Ying Wang2010-01-201-3/+9
* | | | | | | | | Merge "Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functi...Owen Lin2010-01-271-4/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert I3fdda2588a7c612d7c9cfb4f25d9aedd1d609162 which open two functionsOwen Lin2010-01-251-4/+1
* | | | | | | | | | Merge "Add asec permission to DefaultContainerService"Suchi Amalapurapu2010-01-271-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add asec permission to DefaultContainerServiceSuchi Amalapurapu2010-01-271-0/+4
* | | | | | | | | | | Merge "Phase 2 of test file cleanup: relocating test files from FrameworkTest...Neal Nguyen2010-01-27369-739/+1722
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Phase 2 of test file cleanup: relocating test files from FrameworkTest closer...Neal Nguyen2010-01-27369-739/+1722
* | | | | | | | | | | | Merge "Report tombstone (native crash) data to the dropbox."Dan Egnor2010-01-271-28/+56
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |