summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches...Jaikumar Ganesh2011-08-181-0/+14
|\
| * Bluetooth event loop dispatches dbus data on wakeupAlbert Mojir2011-08-161-0/+14
| * Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-07-282-15/+43
* | resolved conflicts for merge of ab3ec176 to honeycomb-plus-aospJaikumar Ganesh2011-07-131-3/+8
|\ \ | |/
| * am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-131-2/+7
| |\
| | * Merge "Bluetooth: correcting return value from cancelDiscovery"Jaikumar Ganesh2011-07-131-2/+7
| | |\
| | | * Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-03-211-2/+7
* | | | am 64ba5eaa: Concurrent multi-PDP support in TrafficStatsKazuhiro Ondo2011-07-101-17/+34
|\ \ \ \
| * | | | Concurrent multi-PDP support in TrafficStatsKazuhiro Ondo2011-07-101-17/+34
* | | | | am 8171e6f6: Use resetConnections with resetMask.Wink Saville2011-07-081-4/+9
|\ \ \ \ \ | |/ / / /
| * | | | Use resetConnections with resetMask.Wink Saville2011-07-071-4/+9
* | | | | am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that s...Jean-Baptiste Queru2011-06-241-1/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compre...Jean-Baptiste Queru2011-06-241-2/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add WEBP to the list of Image formats that support Compression.Vikas Arora2011-06-231-2/+5
| * | | | am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dia...Jaikumar Ganesh2011-06-212-23/+35
| |\ \ \ \
| | * \ \ \ Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gi...Jaikumar Ganesh2011-06-212-23/+35
| | |\ \ \ \
| | | * | | | DO NOT MERGE Incoming Bluetooth Connection requests - dialog.Jaikumar Ganesh2011-06-212-23/+35
| * | | | | | am f3894a04: Merge "Tweak setViewport stuff for fwd-compat"Jean-Baptiste Queru2011-06-082-18/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Tweak setViewport stuff for fwd-compatJean-Baptiste Queru2011-06-082-18/+3
* | | | | | | am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-221-3/+32
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-221-3/+32
| |\ \ \ \ \ \
| | * | | | | | Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""Irfan Sheriff2011-06-211-3/+32
* | | | | | | | am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE...Irfan Sheriff2011-06-221-32/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | resolved conflicts for merge of 267a6181 to honeycomb-LTEIrfan Sheriff2011-06-221-32/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-211-32/+3
* | | | | | | | Updates resulting from the Skia merge (revision 1327)Derek Sollenberger2011-06-132-17/+3
* | | | | | | | am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.Martijn Coenen2011-06-071-0/+13
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.Martijn Coenen2011-06-011-0/+13
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Prevent allocation overflows by corrupt NDEF records.Martijn Coenen2011-05-311-0/+13
| | | |_|/ / | | |/| | |
* | | | | | am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g...Jeff Brown2011-05-254-0/+232
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO ...Jeff Brown2011-05-254-0/+232
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)Jeff Brown2011-05-254-0/+232
* | | | | | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....Jeff Brown2011-05-256-28/+223
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERG...Jeff Brown2011-05-256-28/+223
| |\ \ \ \ \ | | |/ / / /
| | * | | | Improve VelocityTracker numerical stability. (DO NOT MERGE)Jeff Brown2011-05-236-28/+223
* | | | | | am 5c8caba2: am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adopt...Dianne Hackborn2011-05-201-5/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into h...Dianne Hackborn2011-05-201-5/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add ParcelFileDescriptor.fromFd() and .adoptFd().Dianne Hackborn2011-05-201-5/+37
* | | | | | am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register...Jaikumar Ganesh2011-05-201-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Use proper type for oob variable in register_agent. Without this chang...Jaikumar Ganesh2011-05-201-1/+1
| |\ \ \ \ \
| | * | | | | Use proper type for oob variable in register_agent.Nicu Pavel2011-05-051-1/+1
| * | | | | | Adapt to latest skiaDerek Sollenberger2011-05-124-5/+2
* | | | | | | am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-192-1/+17
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 69cb8757: Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-192-1/+17
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Add new "-swNNNdp" resource qualifier.Dianne Hackborn2011-05-192-1/+17
* | | | | | | am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a88b42d5: USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+22
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-191-0/+22
* | | | | | | am 59b1a4ed: Switch to use netd to add/remove routes.Robert Greenwalt2011-05-181-60/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Switch to use netd to add/remove routes.Robert Greenwalt2011-05-181-60/+0