summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import revised translations.Eric Fischer2011-06-0647-27/+211
* am 51a1bb15: am ad466222: am 51a9d157: Merge "Fix account type dialog re-crea...Amith Yamasani2011-06-032-1/+3
|\
| * am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orien...Amith Yamasani2011-06-022-1/+3
| |\
| | * am 51a9d157: Merge "Fix account type dialog re-creation on orientation change...Amith Yamasani2011-06-022-1/+3
| | |\
| | | * Merge "Fix account type dialog re-creation on orientation change." into honey...Amith Yamasani2011-06-022-1/+3
| | | |\
| | | | * Fix account type dialog re-creation on orientation change.Amith Yamasani2011-06-022-1/+3
* | | | | am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mous...Jeff Brown2011-06-034-0/+222
|\ \ \ \ \ | |/ / / /
| * | | | am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." int...Jeff Brown2011-06-024-0/+222
| |\ \ \ \ | | |/ / /
| | * | | am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-024-0/+222
| | |\ \ \ | | | |/ /
| | | * | Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-024-0/+222
| | | |\ \
| | | | * | Add a preference panel for mouse speed.Jeff Brown2011-06-024-0/+222
| | | | |/
* | | | | am 657a7ad8: am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" table...Ben Komalo2011-06-032-79/+81
|\ \ \ \ \ | |/ / / /
| * | | | am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into hon...Ben Komalo2011-06-022-79/+81
| |\ \ \ \ | | |/ / /
| | * | | am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2Ben Komalo2011-06-022-79/+81
| | |\ \ \ | | | |/ /
| | | * | Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2Ben Komalo2011-06-022-79/+81
| | | |\ \
| | | | * | Fix cryptkeeper UI for 7" tablets.Ben Komalo2011-06-022-79/+81
| | | | |/
* | | | | am 1334d7fc: am 300c4f61: am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 300c4f61: am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| | |\ \ \ | | | |/ /
| | | * | Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| | | |/
* | | | resolved conflicts for merge of 6c82fe07 to masterAmith Yamasani2011-06-036-0/+0
|\ \ \ \ | |/ / /
| * | | am 672ad8d6: am 8ac84564: Merge "Move assets to default location, instead of ...Amith Yamasani2011-06-018-0/+0
| |\ \ \ | | |/ /
| | * | am 8ac84564: Merge "Move assets to default location, instead of xlarge only."...Amith Yamasani2011-06-018-0/+0
| | |\ \ | | | |/
| | | * Merge "Move assets to default location, instead of xlarge only." into honeyco...Amith Yamasani2011-06-018-0/+0
| | | |\
| | | | * Move assets to default location, instead of xlarge only.Amith Yamasani2011-06-018-0/+0
* | | | | Merge "Import revised translations."Eric Fischer2011-06-0392-384/+1518
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-06-0292-384/+1518
* | | | | | Merge "Bulletproof CredentialStorage state handling"Brian Carlstrom2011-06-025-46/+207
|\ \ \ \ \ \
| * | | | | | Bulletproof CredentialStorage state handlingBrian Carlstrom2011-06-025-46/+207
* | | | | | | am be6cb943: am 9ef2713f: am 1f7014a2: Merge "Reduce padding to the left of p...Amith Yamasani2011-06-021-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 9ef2713f: am 1f7014a2: Merge "Reduce padding to the left of progress categ...Amith Yamasani2011-05-271-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 1f7014a2: Merge "Reduce padding to the left of progress category to match ...Amith Yamasani2011-05-271-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge "Reduce padding to the left of progress category to match framework cha...Amith Yamasani2011-05-271-1/+1
| | | |\ \ \ \
| | | | * | | | Reduce padding to the left of progress category to match framework changes.Amith Yamasani2011-05-271-1/+1
| | | | | |_|/ | | | | |/| |
* | | | | | | am b667422c: am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings...Gilles Debunne2011-06-024-52/+41
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings/Storage." in...Gilles Debunne2011-05-264-52/+41
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2Gilles Debunne2011-05-264-52/+41
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2Gilles Debunne2011-05-264-52/+41
| | | |\ \ \
| | | | * | | Erase SD Card fixed in Settings/Storage.Gilles Debunne2011-05-264-52/+41
* | | | | | | am 3518cdf9: (-s ours) am c3786952: am beee8290: Merge "Import revised transl...Eric Fischer2011-06-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c3786952: am beee8290: Merge "Import revised translations. DO NOT MERGE" ...Eric Fischer2011-05-2641-616/+83
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycom...Eric Fischer2011-05-2641-616/+83
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2Eric Fischer2011-05-2641-616/+83
| | | |\ \ \ \
| | | | * | | | Import revised translations. DO NOT MERGEEric Fischer2011-05-2641-616/+83
* | | | | | | | Replace INetStatService with TrafficStats.Jeff Sharkey2011-06-011-15/+9
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge "Integrating keystore with keyguard (Part 4 of 4)"Brian Carlstrom2011-06-0156-648/+225
|\ \ \ \ \ \ \
| * | | | | | | Integrating keystore with keyguard (Part 4 of 4)Brian Carlstrom2011-06-0156-648/+225
* | | | | | | | am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for compa...Dianne Hackborn2011-06-014-5/+89
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.Dianne Hackborn2011-05-264-5/+89
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am aef746c4: Implement new manage apps UI for compat mode.Dianne Hackborn2011-05-264-5/+89
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |