| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Merge WebKit at r82507: Update useragent string" | Steve Block | 2011-06-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge WebKit at r82507: Update useragent string | Steve Block | 2011-06-08 | 1 | -1/+1 |
| * | | Merge "Fix the display name of InputMethodSubtype" | satok | 2011-06-08 | 2 | -13/+38 |
| |\ \ | |||||
| | * | | Fix the display name of InputMethodSubtype | satok | 2011-06-08 | 2 | -13/+38 |
| * | | | Merge "Fix the threading behaviour of TTS audio requests." | Narayan Kamath | 2011-06-08 | 7 | -240/+686 |
| |\ \ \ | |||||
| | * | | | Fix the threading behaviour of TTS audio requests. | Narayan Kamath | 2011-06-07 | 7 | -240/+686 |
| | | |/ | |/| | |||||
| * | | | Intent to manage application network data usage. | Jeff Sharkey | 2011-06-08 | 2 | -0/+10 |
| * | | | Compute range-based usage in NetworkStatsHistory. | Jeff Sharkey | 2011-06-07 | 3 | -5/+165 |
| * | | | UID network stats, secure settings, and random. | Jeff Sharkey | 2011-06-07 | 4 | -67/+264 |
| * | | | Map network identity using ConnectivityService. | Jeff Sharkey | 2011-06-07 | 17 | -209/+789 |
| * | | | Merge "Crash in the TouchExplorer" | Svetoslav Ganov | 2011-06-07 | 1 | -8/+12 |
| |\ \ \ | |||||
| | * | | | Crash in the TouchExplorer | Svetoslav Ganov | 2011-06-07 | 1 | -8/+12 |
| * | | | | Merge "Use external/mockwebserver in frameworks/base" | Jesse Wilson | 2011-06-07 | 4 | -14/+14 |
| |\ \ \ \ | |||||
| | * | | | | Use external/mockwebserver in frameworks/base | Jesse Wilson | 2011-06-07 | 4 | -14/+14 |
| * | | | | | Merge "Do not register the callbacks in the constructor." | Chia-chi Yeh | 2011-06-07 | 2 | -7/+6 |
| |\ \ \ \ \ | |||||
| | * | | | | | Do not register the callbacks in the constructor. | Chia-chi Yeh | 2011-05-23 | 2 | -7/+6 |
| * | | | | | | resolved conflicts for merge of a7d01a75 to master | Adam Powell | 2011-06-07 | 2 | -3/+7 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Li... | Adam Powell | 2011-06-07 | 2 | -1/+27 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am a476813d: Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionB... | Adam Powell | 2011-06-07 | 2 | -1/+27 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Make Theme.Holo.Light.NoActionBar and | Adam Powell | 2011-06-07 | 2 | -1/+27 |
| * | | | | | | | | | am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is ... | Wink Saville | 2011-06-07 | 2 | -7/+23 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | am c368831d: Merge "Preferred network discrepancy after rild is restarted." i... | Wink Saville | 2011-06-07 | 2 | -7/+23 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | | * | | | | | | | Merge "Preferred network discrepancy after rild is restarted." into honeycomb... | Wink Saville | 2011-06-07 | 2 | -7/+23 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Preferred network discrepancy after rild is restarted. | Wink Saville | 2011-06-07 | 2 | -7/+23 |
| * | | | | | | | | | | am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE | Robert Greenwalt | 2011-06-07 | 1 | -7/+9 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE | Robert Greenwalt | 2011-06-07 | 1 | -7/+9 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge "Fix NPE in the statusbar." into honeycomb-LTE | Robert Greenwalt | 2011-06-07 | 1 | -7/+9 |
| | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | | | * | | | | | | | Fix NPE in the statusbar. | Robert Greenwalt | 2011-06-06 | 1 | -7/+9 |
| * | | | | | | | | | | am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove disc... | Jaikumar Ganesh | 2011-06-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handle... | Jaikumar Ganesh | 2011-06-07 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into g... | Jaikumar Ganesh | 2011-05-27 | 1 | -15/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread | Jaikumar Ganesh | 2011-05-27 | 1 | -15/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | Remove discoverable timeout handler. DO NOT MERGE | Jaikumar Ganesh | 2011-05-27 | 1 | -15/+1 |
| * | | | | | | | | | | | | | am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-07 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | am 5cb05eea: Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | | Merge "Fix build." into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | Fix build. | Jeff Brown | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4... | Jeff Brown | 2011-06-07 | 2 | -14/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into ... | Jeff Brown | 2011-06-06 | 2 | -14/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 2 | -14/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 2 | -14/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | Revert velocity damping. | Jeff Brown | 2011-06-06 | 2 | -14/+0 |
| * | | | | | | | | | | | | | | am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. B... | Jeff Brown | 2011-06-07 | 4 | -188/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" ... | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycom... | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | |||||
| | | | | * | | | | | | | | | | Simplify spot tracking logic. | Jeff Brown | 2011-06-06 | 4 | -188/+19 |
| * | | | | | | | | | | | | | | resolved conflicts for merge of 8b2c0014 to master | Jeff Brown | 2011-06-07 | 5 | -189/+240 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into h... | Jeff Brown | 2011-06-06 | 5 | -189/+240 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
 |
index : frameworks_base.git | |
| frameworks base |
| summaryrefslogtreecommitdiffstats |