Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "MTP: Include size of 12 byte header in packet size for GetObject data ... | Mike Lockwood | 2010-10-11 | 1 | -1/+3 |
|\ | |||||
| * | MTP: Include size of 12 byte header in packet size for GetObject data packet | Mike Lockwood | 2010-10-11 | 1 | -1/+3 |
* | | Merge "Fix support for 64-bit integers." | Stephen Hines | 2010-10-11 | 8 | -19/+101 |
|\ \ | |||||
| * | | Fix support for 64-bit integers. | Stephen Hines | 2010-10-11 | 8 | -19/+101 |
* | | | Merge "Initialized the orientation variable to -1." | Shimeng (Simon) Wang | 2010-10-11 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | Initialized the orientation variable to -1. | Shimeng (Simon) Wang | 2010-10-11 | 1 | -2/+1 |
* | | | | Merge "Avoid sending false orientation event to webkit." | Shimeng (Simon) Wang | 2010-10-11 | 1 | -2/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Avoid sending false orientation event to webkit. | Shimeng (Simon) Wang | 2010-10-11 | 1 | -2/+6 |
* | | | | Merge "Redraw the screen when needed." | Romain Guy | 2010-10-11 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Redraw the screen when needed. | Romain Guy | 2010-10-11 | 1 | -1/+2 |
* | | | | | resolved conflicts for merge of 2da9338c to master | Gilles Debunne | 2010-10-11 | 1 | -9/+9 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | am b72a335a: Merge "Voice input replaces selected text." into gingerbread | Gilles Debunne | 2010-10-10 | 1 | -13/+10 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge "Voice input replaces selected text." into gingerbread | Gilles Debunne | 2010-10-10 | 1 | -13/+10 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Voice input replaces selected text. | Gilles Debunne | 2010-10-10 | 1 | -13/+10 |
* | | | | | | | | Merge "Color effect comments and method name changes." | Gil Dobjanschi | 2010-10-11 | 2 | -16/+35 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Color effect comments and method name changes. | Gil Dobjanschi | 2010-10-11 | 2 | -16/+35 |
* | | | | | | | | am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into g... | Mike Lockwood | 2010-10-11 | 1 | -9/+32 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread | Mike Lockwood | 2010-10-10 | 1 | -9/+32 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "GPS: More HAL initialization cleanup" into gingerbread | Mike Lockwood | 2010-10-10 | 1 | -9/+32 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | GPS: More HAL initialization cleanup | Mike Lockwood | 2010-10-10 | 1 | -9/+32 |
* | | | | | | | | | Merge "2763342 Toasts do not fire accessibility events" | Amith Yamasani | 2010-10-11 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 2763342 Toasts do not fire accessibility events | Svetoslav Ganov | 2010-10-05 | 1 | -0/+18 |
* | | | | | | | | | | Merge "2853037 AccessibilityEvent should describe Tab controls" | Amith Yamasani | 2010-10-11 | 2 | -1/+32 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 2853037 AccessibilityEvent should describe Tab controls | Svetoslav Ganov | 2010-10-05 | 2 | -1/+32 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge "Updated styles and metrics." | Adam Powell | 2010-10-11 | 18 | -202/+627 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Updated styles and metrics. | Adam Powell | 2010-10-11 | 18 | -202/+627 |
* | | | | | | | | | | am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread | Wink Saville | 2010-10-11 | 1 | -16/+13 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am 96619f9f: Merge "Add some error-case logging." into gingerbread | Wink Saville | 2010-10-10 | 1 | -16/+13 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Add some error-case logging." into gingerbread | Wink Saville | 2010-10-10 | 1 | -16/+13 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Add some error-case logging. | Robert Greenwalt | 2010-10-10 | 1 | -16/+13 |
| | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
* | | | | | | | | | | am e843dea8: (-s ours) am 7efff5c4: Merge "fix getmacaddress race condition (... | Irfan Sheriff | 2010-10-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 7efff5c4: Merge "fix getmacaddress race condition (don\'t auto-merge)" int... | Irfan Sheriff | 2010-10-10 | 1 | -20/+4 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "fix getmacaddress race condition (don't auto-merge)" into gingerbread | Irfan Sheriff | 2010-10-10 | 1 | -20/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | fix getmacaddress race condition (don't auto-merge) | Irfan Sheriff | 2010-10-08 | 1 | -20/+4 |
* | | | | | | | | | | | am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% ... | Mindy Pereira | 2010-10-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available. | Mindy Pereira | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | DO NOT MERGE Set the cap at alpha to 80% of the total available. | Mindy Pereira | 2010-10-10 | 1 | -1/+1 |
* | | | | | | | | | | | resolved conflicts for merge of b3ffd4ad to master | Brad Fitzpatrick | 2010-10-11 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 3ed792d5: Merge "Don\'t perform DNS lookup in android.net.Proxy.isLocalHost" | Brad Fitzpatrick | 2010-10-10 | 1 | -8/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge "Don't perform DNS lookup in android.net.Proxy.isLocalHost" | Brad Fitzpatrick | 2010-10-10 | 1 | -8/+6 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Don't perform DNS lookup in android.net.Proxy.isLocalHost | Andreas Sandblad | 2010-10-04 | 1 | -8/+6 |
* | | | | | | | | | | | | | am 5a41b3f8: am df512214: Merge "Fix startDtmf." into gingerbread | John Wang | 2010-10-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | / / / / / / | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | am df512214: Merge "Fix startDtmf." into gingerbread | John Wang | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge "Fix startDtmf." into gingerbread | John Wang | 2010-10-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Fix startDtmf. | John Wang | 2010-10-10 | 1 | -1/+1 |
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
* | | | | | | | | | | | resolved conflicts for merge of 2da9338c to master | Gilles Debunne | 2010-10-11 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am d14230f1: Merge "Made paste work in ExtractEditText" into gingerbread | Gilles Debunne | 2010-10-10 | 1 | -10/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "Made paste work in ExtractEditText" into gingerbread | Gilles Debunne | 2010-10-10 | 1 | -10/+2 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Made paste work in ExtractEditText | Gilles Debunne | 2010-10-08 | 1 | -10/+2 |
* | | | | | | | | | | | am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multi... | Mike Lockwood | 2010-10-11 | 2 | -22/+29 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |