summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4d8dac07: Merge "Implement issue #6633077: Improve permissions display for...Dianne Hackborn2012-06-183-3/+64
|\
| * Merge "Implement issue #6633077: Improve permissions display for..." into jb-devDianne Hackborn2012-06-153-3/+64
| |\
| | * Implement issue #6633077: Improve permissions display for...Dianne Hackborn2012-06-153-3/+64
* | | am ed99a81e: Merge "Fix issue #6664140: Time to lock should work even Stay aw...Dianne Hackborn2012-06-181-1/+18
|\ \ \ | |/ /
| * | Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into ...Dianne Hackborn2012-06-151-1/+18
| |\ \
| | * | Fix issue #6664140: Time to lock should work even Stay awake...Dianne Hackborn2012-06-151-1/+18
| | |/
* | | am 9d6d89ef: Import translations. DO NOT MERGEYing Wang2012-06-1821-98/+62
|\ \ \ | |/ /
| * | Import translations. DO NOT MERGEYing Wang2012-06-1521-98/+62
| |/
* | am 5ea994c5: Import translations. DO NOT MERGEEric Fischer2012-06-148-26/+17
|\ \ | |/
| * Import translations. DO NOT MERGEEric Fischer2012-06-148-26/+17
* | am 60ec22d1: (-s ours) Merge "Settings: Fixed German translation for turning ...Jean-Baptiste Queru2012-06-130-0/+0
|\ \
| * \ Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on"Jean-Baptiste Queru2012-06-131-2/+2
| |\ \
| | * | Settings: Fixed German translation for turning WLAN/Bluetooth onMarcus Bauer2012-05-271-2/+2
* | | | am 5b7a8204: Merge "Show only the language if there\'s only one locale for th...Amith Yamasani2012-06-131-4/+32
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Show only the language if there's only one locale for the language." i...Amith Yamasani2012-06-131-4/+32
| |\ \ \
| | * | | Show only the language if there's only one locale for the language.Amith Yamasani2012-06-131-4/+32
* | | | | am 612a0c10: Import translations. DO NOT MERGEEric Fischer2012-06-1349-91/+335
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEEric Fischer2012-06-1349-91/+335
| |/ / /
* | | | am cd4428ce: Storage banner when device in low disk state.Jeff Sharkey2012-06-122-1/+25
|\ \ \ \ | |/ / /
| * | | Storage banner when device in low disk state.Jeff Sharkey2012-06-122-1/+25
* | | | Merge "Swap start/stop of SettingsObserver and InputDeviceListener" into jb-d...Jean-Baptiste Queru2012-06-121-2/+2
|\ \ \ \
| * | | | Swap start/stop of SettingsObserver and InputDeviceListenerJean-Baptiste Queru2012-06-121-2/+2
* | | | | Merge "resolved conflicts for merge of 051f46d7 to jb-dev-plus-aosp" into jb-...Jean-Baptiste Queru2012-06-121-3/+15
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 051f46d7 to jb-dev-plus-aospJean-Baptiste Queru2012-06-121-3/+15
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"Jean-Baptiste Queru2012-06-121-3/+15
| | |\ \ \
| | | * | | Unregister ContentObserver in InputMethodAndLanguageSettings classShuhrat Dehkanov2012-06-131-3/+15
* | | | | | am 292d7e3b: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-1239-333/+201
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-1239-333/+201
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEYing Wang2012-06-1239-333/+201
* | | | | | am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-devRussell Brenner2012-06-121-5/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Disable notification alerts in Settings for SUW" into jb-devRussell Brenner2012-06-121-5/+7
| |\ \ \ \ \
| | * | | | | Disable notification alerts in Settings for SUWRussell Brenner2012-06-111-5/+7
* | | | | | | am b5858bbd: Fix NPE in rotation lock content observer.Jeff Brown2012-06-121-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix NPE in rotation lock content observer.Jeff Brown2012-06-121-2/+5
| | |/ / / / | |/| | | |
* | | | | | am 00808b02: Import translations. DO NOT MERGEEric Fischer2012-06-1227-479/+249
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Import translations. DO NOT MERGEEric Fischer2012-06-1127-479/+249
* | | | | | am c56b0146: Merge "Fixing pin_too_short text"Jean-Baptiste Queru2012-06-111-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Fixing pin_too_short text"Jean-Baptiste Queru2012-06-111-1/+1
| |\ \ \ \ \
| | * | | | | Fixing pin_too_short textYouness Ghanim2012-06-111-1/+1
| | | |_|_|/ | | |/| | |
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-110-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Removing head turn and putting blink backDanielle Millett2012-06-085-198/+37
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-080-0/+0
| | |\ \ \ \ \
| | | * | | | | Add back a SYNC_SETTINGS screenAmith Yamasani2012-06-078-23/+287
* | | | | | | | am 450c4c86: Merge "Exit to Settings when removing the only account for a typ...Amith Yamasani2012-06-085-10/+83
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Exit to Settings when removing the only account for a type." into jb-devAmith Yamasani2012-06-085-10/+83
| |\ \ \ \ \ \ \
| | * | | | | | | Exit to Settings when removing the only account for a type.Amith Yamasani2012-06-085-10/+83
| | |/ / / / / /
* | | | | | | | am dba0f9f1: Import translations. DO NOT MERGEEric Fischer2012-06-0852-542/+277
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0852-542/+277
* | | | | | | | am 1e7fa779: Add ID to copy translation from to string that is not translated...Eric Fischer2012-06-081-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /