summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 196926b9: Merge "DO NOT MERGE" into eclairGrace Kloba2010-01-142-56/+58
|\
| * DO NOT MERGEGrace Kloba2010-01-132-56/+58
* | am 56a17690: Merge "TransformGestureDetector is now ScaleGestureDetector - sc...Adam Powell2010-01-132-316/+360
|\ \ | |/
| * TransformGestureDetector is now ScaleGestureDetector - scope reduced.Adam Powell2010-01-132-316/+360
* | am 8acdb201: Added TransformGestureDetector (still in progress) Modified Velo...Adam Powell2010-01-122-52/+403
|\ \ | |/
| * Added TransformGestureDetector (still in progress)Adam Powell2010-01-122-52/+403
* | am ce63c639: Merge "DO NOT MERGE." into eclairGrace Kloba2010-01-122-21/+22
|\ \ | |/
| * Merge "DO NOT MERGE." into eclairGrace Kloba2010-01-122-21/+22
| |\
| | * DO NOT MERGE.Grace Kloba2010-01-122-21/+22
* | | am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted...San Mehat2010-01-124-2/+39
|\ \ \ | |/ /
| * | Merge "framework: storage: Ensure that filesystems are unmounted before shutd...San Mehat2010-01-124-2/+39
| |\ \ | | |/ | |/|
| | * framework: storage: Ensure that filesystems are unmounted before shutdown/rebootSan Mehat2010-01-124-2/+39
* | | am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get ...Jaikumar Ganesh2010-01-111-2/+1
|\ \ \ | |/ /
| * | Don't set priority in Bonding state.Jaikumar Ganesh2010-01-111-2/+1
* | | am 1edd8277: Merge "Hide unused fields" into eclairTom Taylor2010-01-111-7/+12
|\ \ \ | |/ /
| * | Merge "Hide unused fields" into eclairTom Taylor2010-01-111-7/+12
| |\ \ | | |/ | |/|
| | * Hide unused fieldsTom Taylor2010-01-051-7/+12
* | | am a2b0d38f: First draft of multitouch in the WebView.Grace Kloba2010-01-112-169/+398
|\ \ \ | |/ /
| * | First draft of multitouch in the WebView.Grace Kloba2010-01-112-169/+398
* | | am a1759cea: Merge "add eventlog message whenever sqlite reports db corruptio...Vasu Nori2010-01-081-0/+1
|\ \ \ | |/ /
| * | Merge "add eventlog message whenever sqlite reports db corruption error" into...Vasu Nori2010-01-081-0/+1
| |\ \
| | * | add eventlog message whenever sqlite reports db corruption errorVasu Nori2010-01-081-0/+1
* | | | am aa3b5961: javadoc change: fix the selector sample XML in the class descrip...Scott Main2010-01-081-0/+5
|\ \ \ \ | |/ / /
| * | | javadoc change: fix the selector sample XML in the classScott Main2010-01-081-1/+6
* | | | am 663ec308: Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-4/+0
|\ \ \ \ | |/ / /
| * | | Fix issue 2361949: A2DP suspend parameters set wrongly.Eric Laurent2010-01-081-4/+0
| |/ /
* | | am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to b...Dirk Dougherty2010-01-071-22/+22
|\ \ \ | |/ /
| * | Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices...Dirk Dougherty2010-01-071-22/+22
| |\ \
| | * | SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean...Dirk Dougherty2010-01-071-22/+22
* | | | am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclairJaikumar Ganesh2010-01-061-1/+2
|\ \ \ \ | |/ / /
| * | | Fix media option settings for A2DP.Jaikumar Ganesh2010-01-061-1/+2
* | | | am 42c98ada: Still use ro.monkeyYing Wang2010-01-061-2/+1
|\ \ \ \ | |/ / /
| * | | Still use ro.monkeyYing Wang2010-01-061-2/+1
| | |/ | |/|
* | | am 08fa1428: Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
|\ \ \ | |/ /
| * | Rename ro.monkey to monkey.runningYing Wang2010-01-041-1/+1
| |/
* | merge from open-source masterJean-Baptiste Queru2009-12-212-13/+35
|\ \
| * \ Merge change I700e6d4dAndroid Code Review2009-12-211-12/+34
| |\ \
| | * | Time.parse3339 range checking and proper 'sec-frac' skipKenny Root2009-11-161-12/+34
| * | | ImageButton example doesn't work. Default state should be at the last.NoraBora2009-12-171-1/+1
| |/ /
* | | am 11b97c50: Merge change I551ed729 into eclairJaikumar Ganesh2009-12-213-2/+8
|\ \ \ | | |/ | |/|
| * | Merge change I551ed729 into eclairAndroid (Google) Code Review2009-12-213-2/+8
| |\ \
| | * | Use UNDEFINED priorities when unpaired.Jaikumar Ganesh2009-12-113-2/+8
* | | | am 87ed10d7: Merge change I577dd1f3 into eclairJaikumar Ganesh2009-12-211-2/+13
|\ \ \ \ | |/ / /
| * | | Merge change I577dd1f3 into eclairAndroid (Google) Code Review2009-12-211-2/+13
| |\ \ \
| | * | | Accept incoming connections if no other sink is in NonDisconnecting state.Jaikumar Ganesh2009-12-171-2/+13
* | | | | am 77fa05a4: Merge change Iab5952e1 into eclairScott Main2009-12-191-1/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge change Iab5952e1 into eclairAndroid (Google) Code Review2009-12-191-1/+7
| |\ \ \ \
| | * | | | docs: add "required" attribute to the <uses-feature> docsScott Main2009-12-191-1/+7
* | | | | | am a25032a0: Merge change Ic31c0f62 into eclairScott Main2009-12-181-85/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge change Ic31c0f62 into eclairAndroid (Google) Code Review2009-12-181-85/+5
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |