Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev | Makoto Onuki | 2015-06-29 | 1 | -7/+14 |
|\ | |||||
| * | Notification for non-adopotable disks shouldn't be snoozed | Makoto Onuki | 2015-06-24 | 1 | -7/+14 |
* | | Merge "Import translations. DO NOT MERGE" into mnc-dev | Geoff Mendal | 2015-06-29 | 77 | -167/+190 |
|\ \ | |||||
| * | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-06-29 | 77 | -167/+190 |
* | | | Merge "Fix weird case of multi cell icons" into mnc-dev | Jason Monk | 2015-06-29 | 3 | -9/+19 |
|\ \ \ | |||||
| * | | | Fix weird case of multi cell icons | Jason Monk | 2015-06-29 | 3 | -9/+19 |
* | | | | Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev | John Spurlock | 2015-06-29 | 1 | -2/+6 |
|\ \ \ \ | |||||
| * | | | | Volume Dialog: Fix NPE found in monkey testing. | John Spurlock | 2015-06-29 | 1 | -2/+6 |
| |/ / / | |||||
* | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev | Geoff Mendal | 2015-06-29 | 19 | -107/+59 |
|\ \ \ \ | |||||
| * | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-06-29 | 19 | -107/+59 |
| | |/ / | |/| | | |||||
* | | | | Merge "Import translations. DO NOT MERGE" into mnc-dev | Geoff Mendal | 2015-06-29 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Import translations. DO NOT MERGE | Geoff Mendal | 2015-06-29 | 2 | -2/+2 |
| |/ / / | |||||
* | | | | Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev | Kenny Guy | 2015-06-29 | 3 | -10/+4 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Revert "Deprecate APIs for admin to create users." | Kenny Guy | 2015-06-29 | 3 | -10/+4 |
* | | | | Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev | Craig Lafayette | 2015-06-29 | 3 | -13/+14 |
|\ \ \ \ | |||||
| * | | | | Hide MIME_TYPE_PROVISIONING_NFC_V2 | Craig Lafayette | 2015-06-26 | 3 | -13/+14 |
* | | | | | Merge "Deprecate APIs for admin to create users." into mnc-dev | Kenny Guy | 2015-06-29 | 3 | -4/+10 |
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | |||||
| * | | | Deprecate APIs for admin to create users. | Kenny Guy | 2015-06-26 | 3 | -4/+10 |
* | | | | Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." i... | Nicolas Prevot | 2015-06-29 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService. | Nicolas Prevot | 2015-06-26 | 1 | -2/+3 |
* | | | | | Merge "Block assist when screenshots are disabled by policy" into mnc-dev | Benjamin Franz | 2015-06-29 | 5 | -2/+51 |
|\ \ \ \ \ | |||||
| * | | | | | Block assist when screenshots are disabled by policy | Benjamin Franz | 2015-06-26 | 5 | -2/+51 |
* | | | | | | Merge "Fix crash with engines that don't override getVoices()." into mnc-dev | Niels Egberts | 2015-06-29 | 2 | -3/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix crash with engines that don't override getVoices(). | Niels Egberts | 2015-06-26 | 2 | -3/+16 |
* | | | | | | | Merge "Fix crash due to reverse selection." into mnc-dev | Seigo Nonaka | 2015-06-29 | 1 | -3/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix crash due to reverse selection. | Seigo Nonaka | 2015-06-26 | 1 | -3/+7 |
* | | | | | | | | Merge "Add flag indicating device supporting EAP SIM, AKA & AKA'." into mnc-dev | Sanket Padawe | 2015-06-28 | 2 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add flag indicating device supporting EAP SIM, AKA & AKA'. | Sanket Padawe | 2015-06-26 | 2 | -1/+3 |
* | | | | | | | | | Merge "fix temp white list update in device idle" into mnc-dev | Xiaohui Chen | 2015-06-27 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fix temp white list update in device idle | Xiaohui Chen | 2015-06-26 | 1 | -5/+2 |
* | | | | | | | | | | Merge "Properly scope the "only http/https schemes" intent filter semantics" ... | Christopher Tate | 2015-06-27 | 2 | -12/+31 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Properly scope the "only http/https schemes" intent filter semantics | Christopher Tate | 2015-06-26 | 2 | -12/+31 |
* | | | | | | | | | | | Merge "BatteryStats: Record suspend abort reasons" into mnc-dev | Adam Lesinski | 2015-06-27 | 2 | -47/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | BatteryStats: Record suspend abort reasons | Adam Lesinski | 2015-06-25 | 2 | -47/+38 |
* | | | | | | | | | | | | Merge "Update the sensors group label" into mnc-dev | Svetoslav | 2015-06-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update the sensors group label | Svetoslav | 2015-06-26 | 1 | -1/+1 |
* | | | | | | | | | | | | | Merge "Looks like MNC is gonna be API 23." into mnc-dev | Dianne Hackborn | 2015-06-27 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Looks like MNC is gonna be API 23. | Dianne Hackborn | 2015-06-26 | 3 | -3/+3 |
* | | | | | | | | | | | | | | Merge "Write size of operators in writeToParcel()" into mnc-dev | Anil Muthineni | 2015-06-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Write size of operators in writeToParcel() | Anil Muthineni | 2015-06-26 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6:... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to ad... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISS... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk r... | Amit Mahajan | 2015-06-26 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. | Amit Mahajan | 2015-06-26 | 1 | -0/+5 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | | | | | | DO NOT MERGE Change to add STK_PERMISSION for stk related commands. | Amit Mahajan | 2015-06-26 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | | | Merge "Don't apply existing keyguard animation to IME window" into mnc-dev | Jorim Jaggi | 2015-06-26 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | Don't apply existing keyguard animation to IME window | Jorim Jaggi | 2015-06-26 | 1 | -1/+3 |