summaryrefslogtreecommitdiffstats
path: root/core/jni
Commit message (Expand)AuthorAgeFilesLines
* am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrup...Martijn Coenen2011-06-081-0/+13
|\
| * 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
* | | | | | Remove obsolete code.Romain Guy2011-06-083-98/+0
* | | | | | Implement shared-storage full backup/restoreChristopher Tate2011-06-071-0/+2
* | | | | | Merge "Fix USE_TEXT_LAYOUT_CACHE define"Fabrice Di Meglio2011-06-063-19/+43
|\ \ \ \ \ \
| * | | | | | Fix USE_TEXT_LAYOUT_CACHE defineFabrice Di Meglio2011-06-063-19/+43
* | | | | | | Remove dead code related to gettidGlenn Kasten2011-06-031-12/+1
|/ / / / / /
* | | | | | Merge "Take advantage of EGL_BUFFER_PRESERVED on IMG."Romain Guy2011-06-021-2/+21
|\ \ \ \ \ \
| * | | | | | Take advantage of EGL_BUFFER_PRESERVED on IMG.Romain Guy2011-06-021-2/+21
* | | | | | | Bluetooth: correcting return value from cancelDiscoveryAlbert Mojir2011-06-021-3/+8
|/ / / / / /
* | | | | | Merge "Revert "Use AudioTrack::event_type not int in callback""Glenn Kasten2011-06-011-1/+1
|\ \ \ \ \ \
| * | | | | | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
* | | | | | | Merge "Add support to OpenGLRendere to draw BiDi text. Bug #4350336"Romain Guy2011-06-011-5/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add support to OpenGLRendere to draw BiDi text.Romain Guy2011-06-011-5/+7
* | | | | | | Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-011-1/+1
* | | | | | | Fix crash when nesting Picture recording.Marco Nelissen2011-05-311-1/+1
* | | | | | | Fix NdefRecord flags handling.Martijn Coenen2011-05-272-3/+8
|/ / / / / /
* | | | | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4...Jeff Brown2011-05-242-38/+10
|\ \ \ \ \ \
| * | | | | | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-05-242-38/+10
* | | | | | | resolved conflicts for merge of 070a19e0 to masterDianne Hackborn2011-05-231-5/+26
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variabl...Jaikumar Ganesh2011-05-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | 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
* | | | | | | Fix another merge problem.Dianne Hackborn2011-05-191-3/+3
* | | | | | | resolved conflicts for merge of 06a8ceac to masterDianne Hackborn2011-05-192-1/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | resolved conflicts for merge of c1730dcf to masterMike Lockwood2011-05-191-0/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | | Merge c41aefe1Jean-Baptiste Queru2011-05-191-60/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| * | | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...Dianne Hackborn2011-05-161-8/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...Dianne Hackborn2011-05-161-8/+8
| | |\ \ \ \ \ | | | |/ / / /