summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Camera: codegen doc updateYin-Chia Yeh2015-03-272-2/+4
* Merge "HUN: Implement per-package config."John Spurlock2015-03-207-111/+178
|\
| * HUN: Implement per-package config.John Spurlock2015-03-207-111/+178
* | Merge "Add unique id to InputDevice."Tim Kilbourn2015-03-204-5/+34
|\ \
| * | Add unique id to InputDevice.Tim Kilbourn2015-03-204-5/+34
* | | Merge "Disable WiFi energy data collection to avoid deadlock"Adam Lesinski2015-03-201-1/+3
|\ \ \
| * | | Disable WiFi energy data collection to avoid deadlockAdam Lesinski2015-03-191-1/+3
* | | | Merge "Fixing issue with screen-pinning for secondary users."Winson Chung2015-03-202-7/+32
|\ \ \ \
| * | | | Fixing issue with screen-pinning for secondary users.Winson Chung2015-03-192-7/+32
* | | | | Add DelegatedCertInstaller API in DPMSRubin Xu2015-03-205-6/+131
* | | | | Merge changes Iddc971c7,If907f49f,I5505bd2c,I110b5800,I9aeb29c2, ...Lorenzo Colitti2015-03-2018-359/+1422
|\ \ \ \ \
| * | | | | DHCP: Don't write options longer than 255 bytes.Lorenzo Colitti2015-03-201-14/+23
| * | | | | DHCP: parsing robustness fixes.Lorenzo Colitti2015-03-201-105/+123
| * | | | | DHCP: Add a hidden setting to use the legacy DHCP client.Lorenzo Colitti2015-03-201-0/+8
| * | | | | DHCP: Add a Java DHCP client.Lorenzo Colitti2015-03-201-0/+807
| * | | | | Add a protectFromVpn method that takes a FileDescriptorLorenzo Colitti2015-03-201-0/+9
| * | | | | DHCP: protocol changes.Lorenzo Colitti2015-03-203-18/+91
| * | | | | DHCP: glue code.Lorenzo Colitti2015-03-201-3/+58
| * | | | | DHCP: Ethernet/IP packet header changes.Lorenzo Colitti2015-03-201-7/+31
| * | | | | DHCP: Minor cleanups to the packet code.Lorenzo Colitti2015-03-209-234/+83
| * | | | | DHCP: Move the packet code to frameworks/base/services.Lorenzo Colitti2015-03-2011-0/+12
| * | | | | DHCP: Add a native method for making a DHCP socket.Lorenzo Colitti2015-03-202-0/+57
| * | | | | DHCP: Add a superclass for DhcpStateMachine.Lorenzo Colitti2015-03-202-1/+38
| * | | | | Add two utility methods for IPv4 netmasks.Lorenzo Colitti2015-03-202-0/+105
* | | | | | Merge "CEC: Expose API sendStandby()"Jinsuk Kim2015-03-204-0/+39
|\ \ \ \ \ \
| * | | | | | CEC: Expose API sendStandby()Jinsuk Kim2015-03-204-0/+39
* | | | | | | Merge "AudioService: fix String cast crash when mediaserver killed"Phil Burk2015-03-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | AudioService: fix String cast crash when mediaserver killedPhil Burk2015-03-191-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Start respecting View.DRAG_FLAG_GLOBAL flag."Vladislav Kaznacheev2015-03-202-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Start respecting View.DRAG_FLAG_GLOBAL flag.Vladislav Kaznacheev2015-03-182-2/+3
* | | | | | | am 685d33dd: am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110:...Zach Riggle2015-03-190-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 104a29b6: am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix N...Zach Riggle2015-03-190-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ am a7dbe970: am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in Flashli...Zach Riggle2015-03-190-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 901e4008: am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController...Zach Riggle2015-03-190-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ am a6e7a9b5: am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-190-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ am 6a5b2110: Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-191-1/+5
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge "Fix NPE in FlashlightController" into lmp-devZach Riggle2015-03-191-1/+5
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fix NPE in FlashlightControllerAdrian Roos2014-12-151-1/+5
* | | | | | | | | | | | | | am 53699ec6: am d3e6428a: Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am d3e6428a: Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge "New API methods for Script Group"Yang Ni2015-03-191-1/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | New API methods for Script GroupYang Ni2015-03-191-1/+52
| | |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Fix bad nesting count when remote calls fail."Craig Mautner2015-03-194-53/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix bad nesting count when remote calls fail.Craig Mautner2015-03-174-53/+111
* | | | | | | | | | | | | | | | Merge "Avoid throwing ISE in Canvas#restore underflow"Chris Craik2015-03-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Avoid throwing ISE in Canvas#restore underflowChris Craik2015-03-191-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 62c595aa: am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415:...smain@google.com2015-03-191-11/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 6784cf99: am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b:...smain@google.com2015-03-191-11/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am 092a7893: am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add P...smain@google.com2015-03-191-11/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | am d5fdc287: am 3bc84b18: am 910ca415: am 4b53dc8b: Merge "add Places API to ...smain@google.com2015-03-191-11/+40
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | |