Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2014-06-13 | 112 | -5344/+4665 |
|\ | |||||
| * | Import translations. DO NOT MERGE | Baligh Uddin | 2014-06-13 | 112 | -5344/+4665 |
* | | Merge "Show time to go while encrypting drive" | Paul Lawrence | 2014-06-12 | 1 | -0/+4 |
|\ \ | |||||
| * | | Show time to go while encrypting drive | Paul Lawrence | 2014-06-05 | 1 | -0/+4 |
* | | | resolved conflicts for merge of c2c64a31 to master | Mark Salyzyn | 2014-06-13 | 3 | -0/+38 |
|\ \ \ | |||||
| * \ \ | am 5a9a18c1: Merge "logd: Add Developer settings for size" | Mark Salyzyn | 2014-06-13 | 3 | -0/+39 |
| |\ \ \ | |||||
| | * | | | logd: Add Developer settings for size | Mark Salyzyn | 2014-06-13 | 3 | -0/+39 |
| | * | | | am 63ac6a06: am edcb923d: Add string parameter order to default SMS dialog text | David Braun | 2014-03-14 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text... | Alan Viverette | 2014-03-11 | 2 | -0/+6 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captio... | Alan Viverette | 2014-03-11 | 3 | -4/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am a8e634ca: am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display me... | Wei Wang | 2014-03-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertis... | Wei Wang | 2014-03-19 | 3 | -93/+14 |
* | | | | | | | | | Fix padding issue with Dream list item | Fabrice Di Meglio | 2014-06-13 | 1 | -1/+3 |
* | | | | | | | | | Merge "Remove pin and add restrictions for Security settings." | Julia Reynolds | 2014-06-12 | 3 | -1/+42 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Remove pin and add restrictions for Security settings. | Julia Reynolds | 2014-06-13 | 3 | -1/+42 |
* | | | | | | | | | am 8cd7dc23: Merge "Add Settings theme" into lmp-preview-dev | Alan Viverette | 2014-06-12 | 2 | -27/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge "Add Settings theme" into lmp-preview-dev | Alan Viverette | 2014-06-11 | 2 | -27/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Add Settings theme | Alan Viverette | 2014-06-11 | 2 | -27/+5 |
* | | | | | | | | | | | am deb08839: Merge "Fix bug #15384992 Setting Dashboard - padding updates" i... | Fabrice Di Meglio | 2014-06-12 | 3 | -23/+30 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-previ... | Fabrice Di Meglio | 2014-06-11 | 3 | -23/+30 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix bug #15384992 Setting Dashboard - padding updates | Fabrice Di Meglio | 2014-06-11 | 3 | -23/+30 |
* | | | | | | | | | | | | am 26ac83df: Merge "Settings: Remove master swtich from battery saver." into ... | John Spurlock | 2014-06-12 | 2 | -1/+12 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Settings: Remove master swtich from battery saver." into lmp-preview-dev | John Spurlock | 2014-06-10 | 2 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Settings: Remove master swtich from battery saver. | John Spurlock | 2014-06-11 | 2 | -1/+12 |
| | |/ / / / / / / / / | |||||
* | | | | | | | | | | | am f5440793: Merge "Fix bug #15558357 java.lang.RuntimeException: Unable to s... | Fabrice Di Meglio | 2014-06-12 | 1 | -0/+4 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix bug #15558357 java.lang.RuntimeException: Unable to start activity | Fabrice Di Meglio | 2014-06-11 | 1 | -0/+4 |
* | | | | | | | | | | | am caf4b1dd: Fix bug #15543626 Bluetooth Settings headers need to support Qua... | Fabrice Di Meglio | 2014-06-12 | 1 | -1/+2 |
|\| | | | | | | | | | | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix bug #15543626 Bluetooth Settings headers need to support Quantum styling | Fabrice Di Meglio | 2014-06-11 | 1 | -1/+2 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge "Set quantum pattern for crypt dialogs" | Paul Lawrence | 2014-06-11 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Set quantum pattern for crypt dialogs | Paul Lawrence | 2014-06-11 | 1 | -0/+7 |
* | | | | | | | | | | am 782d0f68: Merge "Fix bug #15545573 Battery use chart is incorrect for date... | Fabrice Di Meglio | 2014-06-12 | 1 | -10/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Fix bug #15545573 Battery use chart is incorrect for date labels and t... | Fabrice Di Meglio | 2014-06-10 | 1 | -10/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix bug #15545573 Battery use chart is incorrect for date labels and time axi... | Fabrice Di Meglio | 2014-06-10 | 1 | -10/+0 |
* | | | | | | | | | | am 1c3203e8: Merge "Update Settings redlines per UX request" into lmp-preview... | Fabrice Di Meglio | 2014-06-11 | 6 | -15/+42 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge "Update Settings redlines per UX request" into lmp-preview-dev | Fabrice Di Meglio | 2014-06-10 | 6 | -15/+42 |
| |\| | | | | | | | | |||||
| | * | | | | | | | | Update Settings redlines per UX request | Fabrice Di Meglio | 2014-06-10 | 6 | -15/+42 |
* | | | | | | | | | | am e9ee5e2c: Merge "Settings: Battery saver settings sub-page." into lmp-prev... | John Spurlock | 2014-06-11 | 3 | -0/+58 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge "Settings: Battery saver settings sub-page." into lmp-preview-dev | John Spurlock | 2014-06-10 | 3 | -0/+58 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Settings: Battery saver settings sub-page. | John Spurlock | 2014-06-10 | 3 | -0/+58 |
| * | | | | | | | | | | Remove obsolete NFC unlock XML file. | Martijn Coenen | 2014-06-10 | 1 | -43/+0 |
* | | | | | | | | | | | am a29f3bbf: Merge "Ripple tint is now color" into lmp-preview-dev | Alan Viverette | 2014-06-11 | 3 | -10/+5 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge "Ripple tint is now color" into lmp-preview-dev | Alan Viverette | 2014-06-10 | 3 | -10/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Ripple tint is now color | Alan Viverette | 2014-06-10 | 3 | -10/+5 |
| * | | | | | | | | | | | Merge "Breaks the build. Issue being tracked in b/15538481" into lmp-preview-dev | Baligh Uddin | 2014-06-10 | 112 | -3957/+5286 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Breaks the build. | Baligh Uddin | 2014-06-10 | 112 | -3957/+5286 |
* | | | | | | | | | | | | | am df055ead: Merge "Replace ic_settings_language.png asset to the new one" in... | Fabrice Di Meglio | 2014-06-11 | 5 | -0/+0 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge "Replace ic_settings_language.png asset to the new one" into lmp-previe... | Fabrice Di Meglio | 2014-06-10 | 5 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Replace ic_settings_language.png asset to the new one | Fabrice Di Meglio | 2014-06-10 | 5 | -0/+0 |
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-preview-dev | Baligh Uddin | 2014-06-10 | 112 | -5286/+3957 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| / / / / / / / / / | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2014-06-09 | 112 | -5286/+3957 |