summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_S...Billy Lau2015-08-074-11/+41
|\
| * Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into...Billy Lau2015-08-074-11/+41
| |\
| | * Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGSBilly Lau2015-08-044-11/+41
* | | am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" in...Dianne Hackborn2015-08-071-0/+8
|\ \ \ | |/ /
| * | Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-devDianne Hackborn2015-08-071-0/+8
| |\ \
| | * | Fix issue #23037720: New Battery Optimization StringsDianne Hackborn2015-08-071-0/+8
* | | | am 5ab0e183: Merge "Hide optimization control on battery details page for non...Julia Reynolds2015-08-071-1/+2
|\ \ \ \ | |/ / /
| * | | Merge "Hide optimization control on battery details page for non whitelisted ...Julia Reynolds2015-08-071-1/+2
| |\ \ \ | | |/ / | |/| |
| | * | Hide optimization control on battery details page for non whitelisted apps.Julia Reynolds2015-08-061-1/+2
* | | | am 2d546b77: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-070-0/+0
|\ \ \ \ | |/ / /
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0725-147/+105
* | | | am 4897fa87: Merge "fix CC for work profiles" into mnc-devAndres Morales2015-08-064-22/+49
|\ \ \ \ | |/ / /
| * | | Merge "fix CC for work profiles" into mnc-devAndres Morales2015-08-064-22/+49
| |\ \ \ | | |/ / | |/| |
| | * | fix CC for work profilesAndres Morales2015-08-054-22/+49
| | |/
* | | am 7930f872: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-060-0/+0
|\ \ \ | |/ /
| * | Import translations. DO NOT MERGEGeoff Mendal2015-08-05156-1051/+781
* | | Import translations. DO NOT MERGEGeoff Mendal2015-08-0560-1386/+780
* | | am 888673bd: Hide show/hide system from battery optimizations listJason Monk2015-08-051-2/+4
|\ \ \ | |/ /
| * | Hide show/hide system from battery optimizations listJason Monk2015-08-051-2/+4
* | | am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952:...Sanket Padawe2015-08-050-0/+0
|\ \ \ | |/ /
| * | am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af:...Sanket Padawe2015-08-050-0/+0
| |\ \
| | * \ am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949:...Sanket Padawe2015-08-051-0/+13
| | |\ \
| | | * \ am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143:...Sanket Padawe2015-07-291-0/+13
| | | |\ \
| | | | * \ am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for sp...Sanket Padawe2015-07-291-0/+13
| | | | |\ \
| | | | | * \ am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char wh...Sanket Padawe2015-07-291-0/+13
| | | | | |\ \
| | | | | | * \ am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming d...Sanket Padawe2015-07-291-0/+13
| | | | | | |\ \
| | | | | | | * \ am 74d85949: am e05f7143: Check for special char when renaming device for Wi-...Sanket Padawe2015-07-291-0/+13
| | | | | | | |\ \
| | | | | | | | * \ am e05f7143: Check for special char when renaming device for Wi-Fi direct.Sanket Padawe2015-07-291-0/+13
| | | | | | | | |\ \
| | | | | | | | | * | Check for special char when renaming device for Wi-Fi direct.Sanket Padawe2015-07-281-0/+13
* | | | | | | | | | | am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mn...Ajay Panicker2015-08-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-devAjay Panicker2015-08-051-0/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Implement Bluetooth settings factory reset (5/5)Ajay Panicker2015-08-041-0/+7
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
* | | | | | | | | | | am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-devJason Monk2015-08-051-45/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Remove summaries fro configure apps page" into mnc-devJason Monk2015-08-051-45/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove summaries fro configure apps pageJason Monk2015-08-041-45/+1
* | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-05156-2886/+3249
* | | | | | | | | | | | am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "[Fingerprint] Update string for enrolling" into mnc-devMaurice Lam2015-08-051-5/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
| | | |/ / / / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-devMaurice Lam2015-08-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | [Fingerprint] Shrink fingerprint progress ringMaurice Lam2015-08-041-2/+2
* | | | | | | | | | | | [Fingerprint] Update string for enrollingMaurice Lam2015-08-041-5/+5
* | | | | | | | | | | | resolved conflicts for merge of 1adca55f to mnc-dr-devJason Monk2015-08-043-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_T...Nick Kralevich2015-08-042-45/+32
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFERNick Kralevich2015-07-302-45/+32
* | | | | | | | | | | | Merge "Update USB dialog for USB-C power option" into mnc-dr-devJason Monk2015-08-045-77/+290
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update USB dialog for USB-C power optionJason Monk2015-08-045-77/+290
* | | | | | | | | | | | | am f61ead7a: Make sure accessibility service desc isn\'t clickableJason Monk2015-08-041-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Make sure accessibility service desc isn't clickableJason Monk2015-08-041-0/+1