summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update the internal test case to show the strokeWidth can scale now" i...ztenghui2015-06-242-6/+1
|\
| * Update the internal test case to show the strokeWidth can scale nowztenghui2015-06-242-6/+1
* | Merge "Catching launch errors when trying to go Home while Home is updating."...Winson Chung2015-06-241-4/+10
|\ \
| * | Catching launch errors when trying to go Home while Home is updating.Winson Chung2015-06-241-4/+10
* | | Merge "Make measureText(String, int, int) not use context" into mnc-devRaph Levien2015-06-241-1/+3
|\ \ \
| * | | Make measureText(String, int, int) not use contextRaph Levien2015-06-241-1/+3
* | | | Merge "Require that verified intent filters only have http/https <data> decls...Christopher Tate2015-06-242-11/+27
|\ \ \ \
| * | | | Require that verified intent filters only have http/https <data> declsChristopher Tate2015-06-242-11/+27
* | | | | am f5222156: am 00ebd145: docs: Added "Single Use Devices" video to Android f...Andrew Solovay2015-06-241-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | am 00ebd145: docs: Added "Single Use Devices" video to Android for Work main ...Andrew Solovay2015-06-241-1/+2
| |\ \ \ \
| | * | | | docs: Added "Single Use Devices" video to Android for Work main pageAndrew Solovay2015-06-241-1/+2
* | | | | | Merge "Keymaster INT, LONG and DATE tag values are unsigned." into mnc-devAlex Klyubin2015-06-2417-278/+461
|\ \ \ \ \ \
| * | | | | | Keymaster INT, LONG and DATE tag values are unsigned.Alex Klyubin2015-06-2317-278/+461
* | | | | | | Merge "Notify on BAD_REMOVAL and pass fsUuid in broadcast" into mnc-devTony Mantler2015-06-241-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Notify on BAD_REMOVAL and pass fsUuid in broadcastTony Mantler2015-06-241-0/+2
* | | | | | | | Merge "Fix NPE when walking the set of packages to update app link policy" in...Christopher Tate2015-06-241-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix NPE when walking the set of packages to update app link policyChristopher Tate2015-06-241-1/+3
* | | | | | | | | Merge "Actually wait for installd" into mnc-devMakoto Onuki2015-06-243-9/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Actually wait for installdMakoto Onuki2015-06-243-9/+13
* | | | | | | | | Merge "Volume Motion: Initial show and expand transition." into mnc-devJohn Spurlock2015-06-247-25/+412
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Volume Motion: Initial show and expand transition.John Spurlock2015-06-247-25/+412
* | | | | | | | | | Merge "Fix unit issue in Slog.wtf output" into mnc-devAdam Lesinski2015-06-241-6/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fix unit issue in Slog.wtf outputAdam Lesinski2015-06-241-6/+6
* | | | | | | | | | Merge "Constrain FastScroller max width to be >= 0" into mnc-devAlan Viverette2015-06-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Constrain FastScroller max width to be >= 0Alan Viverette2015-06-241-1/+1
* | | | | | | | | | | Remove unused PermissionsInfo classTodd Volkert2015-06-241-192/+0
* | | | | | | | | | | Merge "Avoid over-damaging layer area for multidraws" into mnc-devChris Craik2015-06-242-8/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Avoid over-damaging layer area for multidrawsChris Craik2015-06-242-8/+19
* | | | | | | | | | | | Merge "don't clear notification effects in response to peeks" into mnc-devChris Wren2015-06-246-6/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | don't clear notification effects in response to peeksChris Wren2015-06-246-6/+37
* | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-devGeoff Mendal2015-06-2477-1388/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-06-2477-1388/+2
* | | | | | | | | | | | | | Merge "Add public action to open voicemail settings." into mnc-devNancy Chen2015-06-243-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add public action to open voicemail settings.Nancy Chen2015-06-233-0/+9
* | | | | | | | | | | | | | | Merge "InCallService meta-data [2/4]" into mnc-devSantos Cordon2015-06-244-1/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | InCallService meta-data [2/4]Santos Cordon2015-06-234-1/+28
* | | | | | | | | | | | | | | | Merge "Additional javadoc." into mnc-devSantos Cordon2015-06-241-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Additional javadoc.Santos Cordon2015-06-221-1/+9
* | | | | | | | | | | | | | | | Merge "Reset permission policy to default when device owner goes away" into m...Esteban Talavera2015-06-242-36/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Reset permission policy to default when device owner goes awayEsteban Talavera2015-06-242-36/+32
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Add new SOURCE_BLUETOOTH_STYLUS." into mnc-devMichael Wright2015-06-243-0/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add new SOURCE_BLUETOOTH_STYLUS.Michael Wright2015-06-233-0/+31
* | | | | | | | | | | | | | | | am c1b4b058: am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down th...Luan Nguyen2015-06-247-968/+922
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am c5a480d1: am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide a...Luan Nguyen2015-06-247-968/+922
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am fdad629f: am 6859a9f0: Merge "docs: Pare down the adb guide and remove sec...Luan Nguyen2015-06-247-968/+922
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 6859a9f0: Merge "docs: Pare down the adb guide and remove sections that ar...Luan Nguyen2015-06-247-968/+922
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Pare down the adb guide and remove sections that are duplicated ...Luan Nguyen2015-06-247-968/+922
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | docs: Pare down the adb guide and remove sections that are duplicatedLuan Nguyen2015-06-227-968/+922
* | | | | | | | | | | | | | | | | | | Merge "Sync canvas proxy CTM (b/21945972)" into mnc-devTom Hudson2015-06-242-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Sync canvas proxy CTM (b/21945972)Tom Hudson2015-06-242-0/+12