summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a protectFromVpn method that takes a FileDescriptorLorenzo Colitti2015-03-171-0/+9
* DHCP: protocol changes.Lorenzo Colitti2015-03-173-18/+91
* DHCP: glue code.Lorenzo Colitti2015-03-161-3/+58
* DHCP: Ethernet/IP packet header changes.Lorenzo Colitti2015-03-161-7/+31
* Merge changes from topic 'dhcpclient' into m-wireless-devLorenzo Colitti2015-03-1615-235/+190
|\
| * DHCP: Minor cleanups to the packet code.Lorenzo Colitti2015-03-169-234/+83
| * DHCP: Move the packet code to frameworks/base/services.Lorenzo Colitti2015-03-1611-0/+12
| * DHCP: Add a native method for making a DHCP socket.Lorenzo Colitti2015-03-162-0/+57
| * DHCP: Add a superclass for DhcpStateMachine.Lorenzo Colitti2015-03-162-1/+38
* | Merge "Add two utility methods for IPv4 netmasks." into m-wireless-devLorenzo Colitti2015-03-162-0/+105
|\ \ | |/
| * Add two utility methods for IPv4 netmasks.Lorenzo Colitti2015-03-162-0/+105
* | Merge "Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK." into m-wire...Paul Jensen2015-03-161-1/+1
|\ \ | |/ |/|
| * Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.Paul Jensen2015-03-131-1/+1
* | Merge "Per controller tx/rx/idle current values - to be populated in device o...Prerepa Viswanadham2015-03-132-0/+16
|\ \
| * | Per controller tx/rx/idle current values - to be populated inPrerepa Viswanadham2015-03-132-0/+16
* | | am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.Roozbeh Pournader2015-03-122-13/+15
|\ \ \
| * \ \ am db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.Roozbeh Pournader2015-03-122-13/+15
| |\ \ \
| | * | | Move Noto Sans Tai Le to the end of the font fallback list.Roozbeh Pournader2015-03-122-13/+15
* | | | | am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManag...Deepanshu Gupta2015-03-123-21/+36
|\ \ \ \ \ | |/ / / /
| * | | | am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManag...Deepanshu Gupta2015-03-123-21/+36
| |\ \ \ \ | | |/ / /
| | * | | Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp...Deepanshu Gupta2015-03-123-21/+36
| | |\ \ \
| | | * | | Tools attribute improvements for RecyclerView LayoutManager.Deepanshu Gupta2015-03-113-21/+36
* | | | | | am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image ...Rich Slogar2015-03-125-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image ...Rich Slogar2015-03-125-6/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into...Rich Slogar2015-03-125-6/+6
| | |\ \ \ \
| | | * \ \ \ am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docsRich Slogar2015-03-125-6/+6
| | | |\ \ \ \
| | | | * \ \ \ am a6b0ddb7: Merge "docs: build image updates" into lmp-docsRich Slogar2015-03-125-6/+6
| | | | |\ \ \ \
| | | | | * \ \ \ Merge "docs: build image updates" into lmp-docsRich Slogar2015-03-125-6/+6
| | | | | |\ \ \ \
| | | | | | * | | | docs: build image updatesRich Slogar2015-02-255-6/+6
* | | | | | | | | | am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendC...Deepanshu Gupta2015-03-121-16/+9
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendC...Deepanshu Gupta2015-03-121-16/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and ...Deepanshu Gupta2015-03-121-16/+9
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode....Deepanshu Gupta2015-03-121-16/+9
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-devDeepanshu Gupta2015-03-121-16/+9
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Fix cyclic dependency in BlendComposite and BlendingMode.Deepanshu Gupta2015-03-111-16/+9
* | | | | | | | | | | am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-devDeepanshu Gupta2015-03-121-23/+32
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-devDeepanshu Gupta2015-03-121-23/+32
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix rare NPE in BridgeContext." into lmp-mr1-devDeepanshu Gupta2015-03-121-23/+32
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | * | | | | | | | Fix rare NPE in BridgeContext.Deepanshu Gupta2015-03-111-23/+32
* | | | | | | | | | | am 71518174: Merge "Fix project settings." into lmp-mr1-devDeepanshu Gupta2015-03-122-2/+28
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 71518174: Merge "Fix project settings." into lmp-mr1-devDeepanshu Gupta2015-03-122-2/+28
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Fix project settings." into lmp-mr1-devDeepanshu Gupta2015-03-122-2/+28
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Fix project settings.Deepanshu Gupta2015-03-102-2/+28
* | | | | | | | | | | am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-devDeepanshu Gupta2015-03-127-10/+332
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-devDeepanshu Gupta2015-03-127-10/+332
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Add RecyclerView support." into lmp-mr1-devDeepanshu Gupta2015-03-127-10/+332
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Add RecyclerView support.Deepanshu Gupta2015-03-107-10/+332
* | | | | | | | | | | am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overvi...Quddus Chong2015-03-12131-52/+196345
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | am 77eb85e1: am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overvi...Quddus Chong2015-03-12131-52/+196345
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and J...Quddus Chong2015-03-11131-52/+196345
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |