Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | Fix a crasher in SensorService | Mathias Agopian | 2011-05-19 | 1 | -2/+1 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge "Code cleanup." | Romain Guy | 2011-05-19 | 1 | -18/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Code cleanup. | Romain Guy | 2011-05-19 | 1 | -18/+7 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to ... | Irfan Sheriff | 2011-05-19 | 1 | -45/+6 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | ||||||
| * | | | | | | | am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigSto... | Irfan Sheriff | 2011-05-19 | 1 | -45/+6 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into hone... | Irfan Sheriff | 2011-05-19 | 1 | -45/+6 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | ||||||
| | | * | | | | | Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 | Irfan Sheriff | 2011-05-19 | 1 | -45/+6 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Move softap config handling to WifiConfigStore | Irfan Sheriff | 2011-05-18 | 1 | -45/+6 | |
* | | | | | | | | | resolved conflicts for merge of b2d0ee16 to master | Kenny Root | 2011-05-19 | 1 | -42/+93 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | ||||||
| * | | | | | | | resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp | Kenny Root | 2011-05-19 | 1 | -45/+95 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread | Kenny Root | 2011-05-19 | 1 | -45/+95 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge "Break apart queries to getInstalled* API" into gingerbread | Kenny Root | 2011-05-19 | 1 | -45/+95 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Break apart queries to getInstalled* API | Kenny Root | 2011-04-19 | 1 | -45/+95 | |
* | | | | | | | | | | | Merge c41aefe1 | Jean-Baptiste Queru | 2011-05-19 | 2 | -20/+219 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 59b1a4ed: Switch to use netd to add/remove routes. | Robert Greenwalt | 2011-05-18 | 2 | -20/+223 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Switch to use netd to add/remove routes. | Robert Greenwalt | 2011-05-18 | 2 | -20/+223 | |
* | | | | | | | | | | | am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rota... | Dianne Hackborn | 2011-05-19 | 1 | -2/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into ho... | Dianne Hackborn | 2011-05-18 | 1 | -2/+16 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2 | Dianne Hackborn | 2011-05-18 | 1 | -2/+16 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Fix fake display size when rotated. | Dianne Hackborn | 2011-05-18 | 1 | -2/+16 | |
* | | | | | | | | | | | am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state cha... | Kazuhiro Ondo | 2011-05-18 | 2 | -7/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am 01758e81: Linkproperties update via unsol data call state change. | Kazuhiro Ondo | 2011-05-18 | 2 | -7/+38 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | Linkproperties update via unsol data call state change. | Kazuhiro Ondo | 2011-05-17 | 2 | -7/+38 | |
* | | | | | | | | | | | am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling imp... | Dianne Hackborn | 2011-05-18 | 5 | -281/+149 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation."... | Dianne Hackborn | 2011-05-17 | 5 | -281/+149 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| | * | | | | | | | | | am a429d5df: Merge "Improve compat mode scaling implementation." into honeyco... | Dianne Hackborn | 2011-05-17 | 5 | -281/+149 | |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | Merge "Improve compat mode scaling implementation." into honeycomb-mr2 | Dianne Hackborn | 2011-05-17 | 5 | -281/+149 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | Improve compat mode scaling implementation. | Dianne Hackborn | 2011-05-17 | 5 | -281/+149 | |
| | | | | |_|_|/ / / / | | | | |/| | | | | | | ||||||
* | | | | | | | | | | | am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId... | Mike Lockwood | 2011-05-18 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" ... | Mike Lockwood | 2011-05-17 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycom... | Mike Lockwood | 2011-05-17 | 1 | -0/+5 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | StorageVolume: Add getStorageId() accessor | Mike Lockwood | 2011-05-17 | 1 | -0/+5 | |
| | | |/ / / / / / | ||||||
* | | | | | | | | | Merge "SurfaceFlinger: unfreeze windows for fixed size buffers." | Jamie Gennis | 2011-05-17 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SurfaceFlinger: unfreeze windows for fixed size buffers. | Jamie Gennis | 2011-05-16 | 1 | -2/+3 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge "First pass at NetworkPolicy and activity tracking." | Jeff Sharkey | 2011-05-17 | 3 | -36/+257 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | First pass at NetworkPolicy and activity tracking. | Jeff Sharkey | 2011-05-13 | 3 | -36/+257 | |
* | | | | | | | | | | am b68c768d: am 41744836: am 7916ac65: Add new command line option to change ... | Dianne Hackborn | 2011-05-16 | 3 | -95/+308 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | am 41744836: am 7916ac65: Add new command line option to change global screen... | Dianne Hackborn | 2011-05-16 | 3 | -95/+308 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | am 7916ac65: Add new command line option to change global screen size. | Dianne Hackborn | 2011-05-16 | 3 | -95/+308 | |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | ||||||
| | | * | | | | | | Add new command line option to change global screen size. | Dianne Hackborn | 2011-05-16 | 3 | -95/+308 | |
| * | | | | | | | | am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on si... | Dianne Hackborn | 2011-05-16 | 1 | -62/+134 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating land... | Dianne Hackborn | 2011-05-16 | 1 | -62/+134 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrai... | Dianne Hackborn | 2011-05-16 | 1 | -62/+134 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | DO NOT MERGE. From main -- Start work on simulating landscape/portrait when ... | Dianne Hackborn | 2011-05-16 | 1 | -62/+134 | |
| * | | | | | | | | | am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deci... | Dianne Hackborn | 2011-05-16 | 2 | -7/+8 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which ro... | Dianne Hackborn | 2011-05-16 | 2 | -7/+8 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use... | Dianne Hackborn | 2011-05-16 | 2 | -7/+8 | |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | ||||||
| | | | * | | | | | | DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an... | Dianne Hackborn | 2011-05-16 | 2 | -7/+8 | |
| * | | | | | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework... | Dianne Hackborn | 2011-05-16 | 4 | -23/+57 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size... | Dianne Hackborn | 2011-05-16 | 4 | -23/+57 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / |