Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for... | Dianne Hackborn | 2012-06-18 | 3 | -3/+64 |
|\ | |||||
| * | Merge "Implement issue #6633077: Improve permissions display for..." into jb-dev | Dianne Hackborn | 2012-06-15 | 3 | -3/+64 |
| |\ | |||||
| | * | Implement issue #6633077: Improve permissions display for... | Dianne Hackborn | 2012-06-15 | 3 | -3/+64 |
* | | | am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay aw... | Dianne Hackborn | 2012-06-18 | 1 | -1/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into ... | Dianne Hackborn | 2012-06-15 | 1 | -1/+18 |
| |\ \ | |||||
| | * | | Fix issue #6664140: Time to lock should work even Stay awake... | Dianne Hackborn | 2012-06-15 | 1 | -1/+18 |
| | |/ | |||||
* | | | am 9d6d89ef: Import translations. DO NOT MERGE | Ying Wang | 2012-06-18 | 21 | -98/+62 |
|\ \ \ | |/ / | |||||
| * | | Import translations. DO NOT MERGE | Ying Wang | 2012-06-15 | 21 | -98/+62 |
| |/ | |||||
* | | am 5ea994c5: Import translations. DO NOT MERGE | Eric Fischer | 2012-06-14 | 8 | -26/+17 |
|\ \ | |/ | |||||
| * | Import translations. DO NOT MERGE | Eric Fischer | 2012-06-14 | 8 | -26/+17 |
* | | am 60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning ... | Jean-Baptiste Queru | 2012-06-13 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" | Jean-Baptiste Queru | 2012-06-13 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Settings: Fixed German translation for turning WLAN/Bluetooth on | Marcus Bauer | 2012-05-27 | 1 | -2/+2 |
* | | | | am 5b7a8204: Merge "Show only the language if there\'s only one locale for th... | Amith Yamasani | 2012-06-13 | 1 | -4/+32 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge "Show only the language if there's only one locale for the language." i... | Amith Yamasani | 2012-06-13 | 1 | -4/+32 |
| |\ \ \ | |||||
| | * | | | Show only the language if there's only one locale for the language. | Amith Yamasani | 2012-06-13 | 1 | -4/+32 |
* | | | | | am 612a0c10: Import translations. DO NOT MERGE | Eric Fischer | 2012-06-13 | 49 | -91/+335 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-06-13 | 49 | -91/+335 |
| |/ / / | |||||
* | | | | am cd4428ce: Storage banner when device in low disk state. | Jeff Sharkey | 2012-06-12 | 2 | -1/+25 |
|\ \ \ \ | |/ / / | |||||
| * | | | Storage banner when device in low disk state. | Jeff Sharkey | 2012-06-12 | 2 | -1/+25 |
* | | | | Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-d... | Jean-Baptiste Queru | 2012-06-12 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Swap start/stop of SettingsObserver and InputDeviceListener | Jean-Baptiste Queru | 2012-06-12 | 1 | -2/+2 |
* | | | | | Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-... | Jean-Baptiste Queru | 2012-06-12 | 1 | -3/+15 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp | Jean-Baptiste Queru | 2012-06-12 | 1 | -3/+15 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class" | Jean-Baptiste Queru | 2012-06-12 | 1 | -3/+15 |
| | |\ \ \ | |||||
| | | * | | | Unregister ContentObserver in InputMethodAndLanguageSettings class | Shuhrat Dehkanov | 2012-06-13 | 1 | -3/+15 |
* | | | | | | am 292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-dev | Ying Wang | 2012-06-12 | 39 | -333/+201 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge "Import translations. DO NOT MERGE" into jb-dev | Ying Wang | 2012-06-12 | 39 | -333/+201 |
| |\ \ \ \ | |||||
| | * | | | | Import translations. DO NOT MERGE | Ying Wang | 2012-06-12 | 39 | -333/+201 |
* | | | | | | am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev | Russell Brenner | 2012-06-12 | 1 | -5/+7 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "Disable notification alerts in Settings for SUW" into jb-dev | Russell Brenner | 2012-06-12 | 1 | -5/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | Disable notification alerts in Settings for SUW | Russell Brenner | 2012-06-11 | 1 | -5/+7 |
* | | | | | | | am b5858bbd: Fix NPE in rotation lock content observer. | Jeff Brown | 2012-06-12 | 1 | -2/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix NPE in rotation lock content observer. | Jeff Brown | 2012-06-12 | 1 | -2/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | am 00808b02: Import translations. DO NOT MERGE | Eric Fischer | 2012-06-12 | 27 | -479/+249 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-06-11 | 27 | -479/+249 |
* | | | | | | am c56b0146: Merge "Fixing pin_too_short text" | Jean-Baptiste Queru | 2012-06-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge "Fixing pin_too_short text" | Jean-Baptiste Queru | 2012-06-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixing pin_too_short text | Youness Ghanim | 2012-06-11 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Reconcile with jb-release | The Android Open Source Project | 2012-06-11 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | Removing head turn and putting blink back | Danielle Millett | 2012-06-08 | 5 | -198/+37 |
| | * | | | | | merge in jb-release history after reset to jb-dev | The Android Automerger | 2012-06-08 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Add back a SYNC_SETTINGS screen | Amith Yamasani | 2012-06-07 | 8 | -23/+287 |
* | | | | | | | | am 450c4c86: Merge "Exit to Settings when removing the only account for a typ... | Amith Yamasani | 2012-06-08 | 5 | -10/+83 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Exit to Settings when removing the only account for a type." into jb-dev | Amith Yamasani | 2012-06-08 | 5 | -10/+83 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Exit to Settings when removing the only account for a type. | Amith Yamasani | 2012-06-08 | 5 | -10/+83 |
| | |/ / / / / / | |||||
* | | | | | | | | am dba0f9f1: Import translations. DO NOT MERGE | Eric Fischer | 2012-06-08 | 52 | -542/+277 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Eric Fischer | 2012-06-08 | 52 | -542/+277 |
* | | | | | | | | am 1e7fa779: Add ID to copy translation from to string that is not translated... | Eric Fischer | 2012-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |