summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-04-0998-950/+423
* Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-0649-0/+686
|\
| * Import translations. DO NOT MERGEEric Fischer2012-04-0649-0/+686
* | Merge "Move to INetworkStatsSession with lifecycle."Jeff Sharkey2012-04-063-14/+25
|\ \
| * | Move to INetworkStatsSession with lifecycle.Jeff Sharkey2012-04-063-14/+25
| |/
* | Merge "Update strings and character limits for some new strings"Amith Yamasani2012-04-062-5/+5
|\ \ | |/ |/|
| * Update strings and character limits for some new stringsAmith Yamasani2012-04-062-5/+5
* | Merge "Use new input manager API."Jeff Brown2012-04-051-39/+13
|\ \
| * | Use new input manager API.Jeff Brown2012-04-051-39/+13
* | | Merge "Update the delete asset with a more modern one."Jean Chalard2012-04-053-0/+0
|\ \ \
| * | | Update the delete asset with a more modern one.Jean Chalard2012-04-053-0/+0
* | | | Merge "Specify up navigation behavior"Adam Powell2012-04-052-48/+101
|\ \ \ \
| * | | | Specify up navigation behaviorAdam Powell2012-04-052-48/+101
| |/ / /
* | | | Merge "Controls to set expensive (metered) networks."Jeff Sharkey2012-04-056-113/+336
|\ \ \ \
| * | | | Controls to set expensive (metered) networks.Jeff Sharkey2012-04-056-113/+336
| |/ / /
* | | | am a3b3f7e8: (-s ours) am d52d02bf: Import translations. DO NOT MERGEEric Fischer2012-04-050-0/+0
|\ \ \ \
| * \ \ \ am d52d02bf: Import translations. DO NOT MERGEEric Fischer2012-04-054-5/+5
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-04-054-5/+5
* | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-04-0555-95/+95
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-04-0555-95/+95
| | |_|/ / / | |/| | | |
* | | | | | Merge "Add new settings UI to select keyboard layout."Jeff Brown2012-04-056-47/+264
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Add new settings UI to select keyboard layout.Jeff Brown2012-04-056-47/+264
| | |_|_|/ | |/| | |
* | | | | Merge "Enable lockscreen configuration for secondary users."Amith Yamasani2012-04-051-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Enable lockscreen configuration for secondary users.Amith Yamasani2012-04-051-1/+1
| |/ / /
* | | | Remove unused layout file.Jeff Brown2012-04-051-43/+0
|/ / /
* | | Fix crash due to lost activity.Vikram Aggarwal2012-04-022-2/+2
* | | am 5797c502: (-s ours) am ca0d6822: Import translations. DO NOT MERGEEric Fischer2012-03-300-0/+0
|\ \ \ | |/ /
| * | am ca0d6822: Import translations. DO NOT MERGEEric Fischer2012-03-301-1/+1
| |\ \ | | |/
| | * Import translations. DO NOT MERGEEric Fischer2012-03-301-1/+1
* | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-3017-239/+152
|\ \ \
| * | | Import translations. DO NOT MERGEEric Fischer2012-03-3017-239/+152
* | | | Merge "Changed text for "accessibility script injection" preference."Svetoslav Ganov2012-03-301-1/+1
|\ \ \ \
| * | | | Changed text for "accessibility script injection" preference.alanv2012-03-301-1/+1
| |/ / /
* | | | Minor changes to improve CryptKeeper readabilityVikram Aggarwal2012-03-301-51/+52
|/ / /
* | | am f8512644: (-s ours) am 841ad7ba: Import translations. DO NOT MERGEEric Fischer2012-03-300-0/+0
|\ \ \ | |/ /
| * | am 841ad7ba: Import translations. DO NOT MERGEEric Fischer2012-03-291-2/+2
| |\ \ | | |/
| | * Import translations. DO NOT MERGEEric Fischer2012-03-291-2/+2
* | | Import translations. DO NOT MERGEEric Fischer2012-03-2975-1385/+864
* | | Merge "Fix discovery state tracking"Irfan Sheriff2012-03-291-13/+13
|\ \ \
| * | | Fix discovery state trackingIrfan Sheriff2012-03-281-13/+13
* | | | Merge "Only enable multi-user settings if a secure settings flag is set"Amith Yamasani2012-03-281-1/+9
|\ \ \ \
| * | | | Only enable multi-user settings if a secure settings flag is setAmith Yamasani2012-03-281-1/+9
* | | | | Import translations. DO NOT MERGEEric Fischer2012-03-2898-92/+1790
* | | | | Merge "Convert to new KeyStore format"Kenny Root2012-03-271-3/+29
|\ \ \ \ \
| * | | | | Convert to new KeyStore formatKenny Root2012-03-211-3/+29
* | | | | | Merge "Update Wifi to use new keystore function"Kenny Root2012-03-271-8/+11
|\ \ \ \ \ \
| * | | | | | Update Wifi to use new keystore functionKenny Root2012-03-211-8/+11
| |/ / / / /
* | | | | | Merge "Switch VPN to use keystore ENGINE"Kenny Root2012-03-271-3/+6
|\ \ \ \ \ \
| * | | | | | Switch VPN to use keystore ENGINEKenny Root2012-03-211-3/+6
| |/ / / / /
* | | | | | am fe8b3e9a: (-s ours) am f4ce8c93: Import translations. DO NOT MERGEEric Fischer2012-03-270-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |