summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-devMakoto Onuki2015-06-291-7/+14
|\
| * Notification for non-adopotable disks shouldn't be snoozedMakoto Onuki2015-06-241-7/+14
* | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-2977-167/+190
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2015-06-2977-167/+190
* | | Merge "Fix weird case of multi cell icons" into mnc-devJason Monk2015-06-293-9/+19
|\ \ \
| * | | Fix weird case of multi cell iconsJason Monk2015-06-293-9/+19
* | | | Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-devJohn Spurlock2015-06-291-2/+6
|\ \ \ \
| * | | | Volume Dialog: Fix NPE found in monkey testing.John Spurlock2015-06-291-2/+6
| |/ / /
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-2919-107/+59
|\ \ \ \
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2919-107/+59
| | |/ / | |/| |
* | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-292-2/+2
|\ \ \ \
| * | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-292-2/+2
| |/ / /
* | | | Merge "Revert "Deprecate APIs for admin to create users."" into mnc-devKenny Guy2015-06-293-10/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "Deprecate APIs for admin to create users."Kenny Guy2015-06-293-10/+4
* | | | Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-devCraig Lafayette2015-06-293-13/+14
|\ \ \ \
| * | | | Hide MIME_TYPE_PROVISIONING_NFC_V2Craig Lafayette2015-06-263-13/+14
* | | | | Merge "Deprecate APIs for admin to create users." into mnc-devKenny Guy2015-06-293-4/+10
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Deprecate APIs for admin to create users.Kenny Guy2015-06-263-4/+10
* | | | Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." i...Nicolas Prevot2015-06-291-2/+3
|\ \ \ \
| * | | | Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.Nicolas Prevot2015-06-261-2/+3
* | | | | Merge "Block assist when screenshots are disabled by policy" into mnc-devBenjamin Franz2015-06-295-2/+51
|\ \ \ \ \
| * | | | | Block assist when screenshots are disabled by policyBenjamin Franz2015-06-265-2/+51
* | | | | | Merge "Fix crash with engines that don't override getVoices()." into mnc-devNiels Egberts2015-06-292-3/+16
|\ \ \ \ \ \
| * | | | | | Fix crash with engines that don't override getVoices().Niels Egberts2015-06-262-3/+16
* | | | | | | Merge "Fix crash due to reverse selection." into mnc-devSeigo Nonaka2015-06-291-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix crash due to reverse selection.Seigo Nonaka2015-06-261-3/+7
* | | | | | | | Merge "Add flag indicating device supporting EAP SIM, AKA & AKA'." into mnc-devSanket Padawe2015-06-282-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add flag indicating device supporting EAP SIM, AKA & AKA'.Sanket Padawe2015-06-262-1/+3
* | | | | | | | | Merge "fix temp white list update in device idle" into mnc-devXiaohui Chen2015-06-271-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix temp white list update in device idleXiaohui Chen2015-06-261-5/+2
* | | | | | | | | | Merge "Properly scope the "only http/https schemes" intent filter semantics" ...Christopher Tate2015-06-272-12/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Properly scope the "only http/https schemes" intent filter semanticsChristopher Tate2015-06-262-12/+31
* | | | | | | | | | | Merge "BatteryStats: Record suspend abort reasons" into mnc-devAdam Lesinski2015-06-272-47/+38
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | BatteryStats: Record suspend abort reasonsAdam Lesinski2015-06-252-47/+38
* | | | | | | | | | | | Merge "Update the sensors group label" into mnc-devSvetoslav2015-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update the sensors group labelSvetoslav2015-06-261-1/+1
* | | | | | | | | | | | | Merge "Looks like MNC is gonna be API 23." into mnc-devDianne Hackborn2015-06-273-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Looks like MNC is gonna be API 23.Dianne Hackborn2015-06-263-3/+3
* | | | | | | | | | | | | | Merge "Write size of operators in writeToParcel()" into mnc-devAnil Muthineni2015-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Write size of operators in writeToParcel()Anil Muthineni2015-06-261-0/+1
* | | | | | | | | | | | | | | am 293facf4: (-s ours) am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am...Amit Mahajan2015-06-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am ad6a2da8: am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6:...Amit Mahajan2015-06-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 2da8a992: am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE...Amit Mahajan2015-06-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b98f786c: am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to ad...Amit Mahajan2015-06-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 5b8976a5: am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISS...Amit Mahajan2015-06-260-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 853c6178: am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk r...Amit Mahajan2015-06-260-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | DO NOT MERGE Change to add STK_PERMISSION for stk related commands.Amit Mahajan2015-06-261-0/+5
* | | | | | | | | | | | | | | | | | | | | Merge "Don't apply existing keyguard animation to IME window" into mnc-devJorim Jaggi2015-06-261-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Don't apply existing keyguard animation to IME windowJorim Jaggi2015-06-261-1/+3