summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into g...Mike Lockwood2010-10-111-9/+32
|\
| * am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbreadMike Lockwood2010-10-101-9/+32
| |\
| | * Merge "GPS: More HAL initialization cleanup" into gingerbreadMike Lockwood2010-10-101-9/+32
| | |\
| | | * GPS: More HAL initialization cleanupMike Lockwood2010-10-101-9/+32
* | | | Merge "2763342 Toasts do not fire accessibility events"Amith Yamasani2010-10-111-0/+18
|\ \ \ \
| * | | | 2763342 Toasts do not fire accessibility eventsSvetoslav Ganov2010-10-051-0/+18
* | | | | Merge "2853037 AccessibilityEvent should describe Tab controls"Amith Yamasani2010-10-112-1/+32
|\ \ \ \ \
| * | | | | 2853037 AccessibilityEvent should describe Tab controlsSvetoslav Ganov2010-10-052-1/+32
| |/ / / /
* | | | | Merge "Updated styles and metrics."Adam Powell2010-10-1118-202/+627
|\ \ \ \ \
| * | | | | Updated styles and metrics.Adam Powell2010-10-1118-202/+627
* | | | | | am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-111-16/+13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-101-16/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-101-16/+13
| | |\ \ \ \
| | | * | | | Add some error-case logging.Robert Greenwalt2010-10-101-16/+13
* | | | | | | am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (...Irfan Sheriff2010-10-110-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" int...Irfan Sheriff2010-10-101-20/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbreadIrfan Sheriff2010-10-101-20/+4
| | |\ \ \ \ \
| | | * | | | | fix getmacaddress race condition (don't auto-merge)Irfan Sheriff2010-10-081-20/+4
* | | | | | | | am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% ...Mindy Pereira2010-10-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.Mindy Pereira2010-10-101-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE Set the cap at alpha to 80% of the total available.Mindy Pereira2010-10-101-1/+1
* | | | | | | | resolved conflicts for merge of b3ffd4ad to masterBrad Fitzpatrick2010-10-111-6/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost"Brad Fitzpatrick2010-10-101-8/+6
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost"Brad Fitzpatrick2010-10-101-8/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Don't perform DNS lookup in android.net.Proxy.isLocalHostAndreas Sandblad2010-10-041-8/+6
* | | | | | | | | | am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | am df512214: Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix startDtmf." into gingerbreadJohn Wang2010-10-101-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Fix startDtmf.John Wang2010-10-101-1/+1
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | resolved conflicts for merge of 2da9338c to masterGilles Debunne2010-10-111-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am d14230f1: Merge "Made paste work in ExtractEditText" into gingerbreadGilles Debunne2010-10-101-10/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Made paste work in ExtractEditText" into gingerbreadGilles Debunne2010-10-101-10/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Made paste work in ExtractEditTextGilles Debunne2010-10-081-10/+2
* | | | | | | | am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multi...Mike Lockwood2010-10-112-22/+29
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" in...Mike Lockwood2010-10-092-22/+29
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbreadMike Lockwood2010-10-092-22/+29
| | |\ \ \ \ \ \
| | | * | | | | | GPS: Do not call sGpsInterface->init() multiple timesMike Lockwood2010-10-092-22/+29
* | | | | | | | | Merge "Double the performance of animations."Chet Haase2010-10-111-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Double the performance of animations.Chet Haase2010-10-111-2/+3
* | | | | | | | | | am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen i...Chung-yih Wang2010-10-111-1/+21
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into ...Chung-yih Wang2010-10-081-1/+21
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Do not release the wifi lock if the screen is off." into gingerbreadChung-yih Wang2010-10-081-1/+21
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Do not release the wifi lock if the screen is off.Chung-yih Wang2010-10-091-1/+21
* | | | | | | | | | am 4c2c62fe: am bed5af7e: am 456fe3b3: add some pages to the sitemap file in ...Scott Main2010-10-111-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am bed5af7e: am 456fe3b3: add some pages to the sitemap file in an attempt to...Scott Main2010-10-081-0/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 456fe3b3: add some pages to the sitemap file in an attempt to kick-start t...Scott Main2010-10-081-0/+5
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | add some pages to the sitemap file in an attempt to kick-start the build serv...Scott Main2010-10-081-0/+5
* | | | | | | | | | resolved conflicts for merge of 42dd7ec9 to masterGilles Debunne2010-10-111-9/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am a827d7bc: Merge "Other improvements to text cursor movement." into gingerb...Gilles Debunne2010-10-081-13/+24
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Other improvements to text cursor movement." into gingerbreadGilles Debunne2010-10-081-13/+24
| | |\ \ \ \ \ \ \ \