summaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-101-4/+4
|\
| * am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...Dianne Hackborn2011-06-091-4/+4
| |\
| | * am 220cd77d: Merge "Enforce public resource restriction on bag parents." into...Dianne Hackborn2011-06-091-4/+4
| | |\
| | | * Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-091-4/+4
* | | | am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "...Dianne Hackborn2011-06-091-2/+3
|\ \ \ \ | |/ / /
| * | | am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat...Dianne Hackborn2011-06-081-2/+3
| |\ \ \ | | |/ /
| | * | am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into ...Dianne Hackborn2011-06-081-2/+3
| | |\ \ | | | |/
| | | * Fix for not reporting correct "sw" in compat mode.Dianne Hackborn2011-06-081-2/+3
* | | | am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeyco...Wink Saville2011-06-091-2/+9
|\ \ \ \ | |/ / /
| * | | am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTEWink Saville2011-06-081-2/+9
| |\ \ \ | | |/ /
| | * | Merge "Fix default preferred network." into honeycomb-LTEWink Saville2011-06-081-2/+9
| | |\ \
| | | * | Fix default preferred network.Wink Saville2011-06-081-2/+9
| * | | | am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mod...Dianne Hackborn2011-06-078-0/+96
| |\ \ \ \ | | |/ / /
| | * | | am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into h...Dianne Hackborn2011-06-078-0/+96
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * DO NOT MERGE. Experimental compatibility mode UI.Daniel Sandler2011-06-078-0/+96
* | | | Merge "The UI part of the user space VPN support."Chia-chi Yeh2011-06-088-0/+534
|\ \ \ \
| * | | | The UI part of the user space VPN support.Chia-chi Yeh2011-06-038-0/+534
* | | | | am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTERobert Greenwalt2011-06-071-7/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTERobert Greenwalt2011-06-071-7/+9
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix NPE in the statusbar.Robert Greenwalt2011-06-061-7/+9
| * | | | am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-06-063-8/+8
| |\ \ \ \ | | |/ / /
| | * | | am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-06-063-8/+8
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Import revised translations. DO NOT MERGEEric Fischer2011-06-033-8/+8
* | | | | Merge "Don't ack/nak backup redundantly at exit"Christopher Tate2011-06-071-15/+16
|\ \ \ \ \
| * | | | | Don't ack/nak backup redundantly at exitChristopher Tate2011-06-071-15/+16
* | | | | | Merge "Experimental compatibility mode UI."Daniel Sandler2011-06-078-0/+96
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Experimental compatibility mode UI.Daniel Sandler2011-06-078-0/+96
* | | | | | Implement shared-storage full backup/restoreChristopher Tate2011-06-074-0/+156
|/ / / / /
* | | | | Merge "Respect android:allowBackup="false" during full backup & restore"Christopher Tate2011-06-031-1/+1
|\ \ \ \ \
| * | | | | Respect android:allowBackup="false" during full backup & restoreChristopher Tate2011-06-031-1/+1
| | |_|_|/ | |/| | |
* | | | | resolved conflicts for merge of ca2b552d to masterJeff Brown2011-06-032-0/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." int...Jeff Brown2011-06-022-0/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-022-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Add a preference panel for mouse speed.Jeff Brown2011-06-022-0/+6
* | | | | resolved conflicts for merge of b9e2f68b to masterDianne Hackborn2011-06-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background d...Dianne Hackborn2011-06-011-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach...Dianne Hackborn2011-06-011-1/+1
| | |\ \ \ | | | |/ /
| | | * | Fix issue #4500511: Holo effect background doesn't reach top of screen anymoreDianne Hackborn2011-06-011-1/+1
* | | | | Merge "Import revised translations."Eric Fischer2011-06-033-8/+8
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-06-023-8/+8
| | |_|_|/ | |/| | |
* | | | | resolved conflicts for merge of 7e2181c0 to mastersatok2011-06-036-6/+88
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow s...satok2011-05-286-6/+89
| |\ \ \ | | |/ /
| | * | am 5485ff61: Reduce the number of notification icons on narrow screens.satok2011-05-286-6/+89
| | |\ \ | | | |/
| | | * Reduce the number of notification icons on narrow screens.satok2011-05-286-6/+89
* | | | resolved conflicts for merge of 76450622 to masterDianne Hackborn2011-06-024-16/+21
|\ \ \ \ | |/ / /
| * | | am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system o...Dianne Hackborn2011-05-264-16/+21
| |\ \ \ | | |/ /
| | * | am 7a09f72b: Merge "Rework how we decide whether to use system or status bar....Dianne Hackborn2011-05-264-16/+21
| | |\ \ | | | |/
| | | * Merge "Rework how we decide whether to use system or status bar." into honeyc...Dianne Hackborn2011-05-264-16/+21
| | | |\
| | | | * Rework how we decide whether to use system or status bar.Dianne Hackborn2011-05-264-16/+21
| * | | | am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-05-2637-0/+1073
| |\ \ \ \ | | |/ / /